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

On Sun, Dec 15, 2013 at 5:36 PM, Levi Morrison <morrison.levi@gmail.com> wrote: > >> 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. > Mhh. I don't think this "list just pulls out the last message". I suspect in the middle of the rebase you got confused between and previous commit and when git stopped to let you fix a conflict before committing the entire patch you thought it had committed the full patch except the conflicted lines? >> >> 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? diff --git a/downloads.php b/downloads.php index 1d2ca80..7acc73f 100644 --- a/downloads.php +++ b/downloads.php @@ -51,24 +51,26 @@ $SIDEBAR_DATA = ' <p class="panel"><a href="/git.php">Development sources (git)</a></p> <p class="panel"><a href="/releases/">Old archives</a></p> -<div class="otherbins"> -<p class="announcements"> - We do not distribute UNIX/Linux binaries. Most Linux - distributions come with PHP these days, so if you do - not want to compile your own, go to your distribution\'s - download site. Binaries available on external servers: -</p> -<p class="panel"><a href="http://windows.php.net">Windows Binaries</a></p> ^^^^^^^^^^ look here -<ul class="toc"> - <li class="panel"><a href="http://www.ampps.com/">Mac OS X (AMPPS)</a></li> - <li class="panel"><a href="http://www.mamp.info/">Mac OS X (MAMP)</a></li> - <li class="panel"><a href="http://bitnami.com/stack/mamp">Mac OS X (BitNami)</a></li> - <li class="panel"><a href="http://bitnami.com/stack/wamp">Windows (BitNami)</a></li> - <li class="panel"><a href="http://bitnami.com/stack/lamp">Linux (BitNami)</a></li> - <li class="panel"><a href="http://www.opencsw.org/packages/php5">Solaris OpenCSW packages</a></li> - <li class="panel"><a href="http://iuscommunity.org/">Redhat/CentOS Binaries (IUS)</a></li> - <li class="panel"><a href="http://rpms.famillecollet.com/">Fedora/Redhat/CentOS Binaries (Remi)</a></li> -</ul> +<div class="panel"> + <p class="headline">Binaries</p> + <div class="body"> + <p> + We do not distribute UNIX/Linux binaries. Most Linux + distributions come with PHP these days, so if you do + not want to compile your own, go to your distribution\'s + download site. Binaries available on external servers: + </p> + <ul> >>>>>> look here <<<<<< + <li><a href="http://www.ampps.com/">Mac OS X (AMPPS)</a></li> + <li><a href="http://www.mamp.info/">Mac OS X (MAMP)</a></li> + <li><a href="http://bitnami.com/stack/mamp">Mac OS X (BitNami)</a></li> + <li><a href="http://bitnami.com/stack/wamp">Windows (BitNami)</a></li> + <li><a href="http://bitnami.com/stack/lamp">Linux (BitNami)</a></li> + <li><a href="http://www.opencsw.org/packages/php5">Solaris OpenCSW packages</a></li> + <li><a href="http://iuscommunity.org/">Redhat/CentOS Binaries (IUS)</a></li> + <li><a href="http://rpms.famillecollet.com/">Fedora/Redhat/CentOS Binaries (Remi)</a></li> + </ul> + </div> </div> The windows.php.net link was completely removed. Not that I am very much against removing the entire subdomain, but that seems a littlebit out of scope here. -Hannes