From aec11b3a5fa801abebec10ce113f604afc70449c Mon Sep 17 00:00:00 2001
From: wxlund <wxlund@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 6 Mar 2008 17:13:09 +0000
Subject: [PATCH] Messed up the .project file with accidental inclusion of
 groovy and eUML.  I've removed and restored to what I think it was before.

---
 docs/.project | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/docs/.project b/docs/.project
index 38811d980..4862ed9a3 100644
--- a/docs/.project
+++ b/docs/.project
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>docs</name>
@@ -22,34 +21,4 @@
 		<nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
 	</natures>
 </projectDescription>
-=======
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>docs</name>
-	<comment>@key 32303037303533312D313020646F63732F77786C756E64 </comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.soyatec.additional.Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.codehaus.groovy.eclipse.groovyBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.soyatec.additional.Nature</nature>
-		<nature>org.codehaus.groovy.eclipse.groovyNature</nature>
-	</natures>
-</projectDescription>
->>>>>>> .r10743
+