roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r280763 - /incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties
Date Wed, 14 Sep 2005 04:24:54 GMT
Author: snoopdave
Date: Tue Sep 13 21:24:51 2005
New Revision: 280763

URL: http://svn.apache.org/viewcvs?rev=280763&view=rev
Log:
Just comments

Modified:
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties?rev=280763&r1=280762&r2=280763&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties Tue Sep 13
21:24:51 2005
@@ -24,7 +24,6 @@
 # properties in this file are accessed like this ...
 #    RollerConfig.getProperty("propname");
 
-<<<<<<< .working
 # User management settings
 
 # True to allow users to register themselves via a "register" link on the main
@@ -103,7 +102,7 @@
 #----------------------------------
 # Enabled plugins ... remember, order does matter!!
 
-# Weblog entry editor plugins (all are off by default).
+# Weblog entry editor plugins
 plugins.page=\
 org.roller.presentation.velocity.plugins.convertbreaks.ConvertLineBreaksPlugin \
 ,org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin \



Mime
View raw message