Re: [PHP-WEBMASTER] 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

[Hannes Magnusson]

This doesn't look like a conflict merge fix at all.
And do you have any plans on adding the link to windows.php.net again?

-Hannes


On Sun, Dec 15, 2013 at 10:27 AM, Levi Morrison <le...@php.net> wrote:
> Commit:    e916105a19f5d9049ca1a04252ce066819b1be0e
> Author:    Levi Morrison <le...@php.net>         Sun, 15 Dec 2013 11:27:28 
> -0700
> Parents:   204d7a45f5cab3770a5a703c569ad4a8ade27b9f
> Branches:  master
>
> Link:       
> http://git.php.net/?p=web/php.git;a=commitdiff;h=e916105a19f5d9049ca1a04252ce066819b1be0e
>
> Log:
> Fixed merge conflict.
>
> Changed paths:
>   M  build-setup.php
>   M  docs.php
>   M  downloads.php
>   M  get-involved.php
>   M  include/footer.inc
>   M  include/header.inc
>   M  index.php
>   M  releases/index.php
>   M  styles/home.css
>   M  styles/theme-base.css
>   M  styles/theme-medium.css
>   M  support.php
>
>
> --
> PHP Webmaster List Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php

-- 
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php