Re: com web/php: Fixed merge conflict.: build-setup.php docs.php downloads.php get-involved.php include/footer.inc include/header.inc index.php
releases/index.php styles/home.css styles/theme-base.css styles/theme-medium.css support.php
| From: | Levi Morrison | Date: | Mon, 16 Dec 2013 01:36:21 +0000 |
| Subject: | Re: com web/php: Fixed merge conflict.: build-setup.php docs.php downloads.php get-involved.php include/footer.inc include/header.inc index.php releases/index.php styles/home.css styles/theme-base.css styles/theme-medium.css support.php |
||
| References: | 1 2 | Groups: | php.webmaster |
| Request: | Send a blank email to php-webmaster+get-17662@lists.php.net to get a copy of this message | ||
> This doesn't look like a conflict merge fix at all.
>
Oh, I forget this list just pulls out the last message to display when
merging a branch; there was a local branch of mine that I merged. There was
a 2-line conflict when I went to push because of some changes __dm (Dejan)
made just before pushing.
> And do you have any plans on adding the link to windows.php.net again?
I'm not sure what link you are talking about?