forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Crossley <cross...@apache.org>
Subject [heads-up] potential svn conflicts (Was: svn commit: r239358 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/ ...)
Date Thu, 25 Aug 2005 02:11:24 GMT
I fixed some non-native line-endings problems with this
commit and some other recent commits.

However that might be creating just the problem we are
trying to avoid when doing the whitespace cleanup.
People might be getting conflicts if they have been
editing these files.

-David

> Author: crossley
> Date: Mon Aug 22 23:10:04 2005
> New Revision: 239358
> 
> URL: http://svn.apache.org/viewcvs?rev=239358&view=rev
> Log:
> Fix line-endings.
> 
> Modified:
>     forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/forrest.css.xslt
  (contents, props changed)
>     forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/leather-dev.css
>     forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.basic.css
>     forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.print.css
>     forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/pelt.screen.css
>     forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/pelt/profile.css.xslt
> 

Mime
View raw message