search

BRL-CAD / web

BRL-CAD's primary website
BSD 2-Clause "Simplified" License
11 stars 28 forks source link

new updates in theme file #5

Closed sofathitesh closed 8 years ago

sofathitesh commented 9 years ago

Please accept this pull request.

sofathitesh commented 9 years ago

I have made the changes in header.php, content.php and css files to. The reason behind this changes is improve th e layout of theme as well user experience. Please check this pull request .

brlcad commented 8 years ago

these changes could not be applied. the problem is that you've forcibly committed newline changes to these files in addition to your changes, from LF (unix) to CRLF (windows). this is what is causing the conflicts.

you need to rebaseline your changes with the latest master sources with the right newline settings. see this for details: https://help.github.com/articles/dealing-with-line-endings/