Author: hlship
Date: Sat Apr 8 13:36:07 2006
New Revision: 392602
URL: http://svn.apache.org/viewcvs?rev=392602&view=rev
Log:
Remove merge comments
Modified:
jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs
Modified: jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs?rev=392602&r1=392601&r2=392602&view=diff
==============================================================================
--- jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ jakarta/tapestry/trunk/.settings/org.eclipse.jdt.core.prefs Sat Apr 8
13:36:07 2006
@@ -1,7 +1,4 @@
#Tue Mar 14 22:37:08 EST 2006
-=\=\=\=\=\=\=
-<<<<<<<=.working
->>>>>>>=.merge-right.r368223
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
