Title: [jbehave] [587] trunk/plugins/eclipse/META-INF/MANIFEST.MF: [FL] fixing MANIFEST.MF
Revision
587
Author
felix
Date
2006-11-27 17:07:41 -0600 (Mon, 27 Nov 2006)

Log Message

[FL] fixing MANIFEST.MF

Modified Paths


Diff

Modified: trunk/plugins/eclipse/META-INF/MANIFEST.MF (586 => 587)

--- trunk/plugins/eclipse/META-INF/MANIFEST.MF	2006-11-27 18:54:23 UTC (rev 586)
+++ trunk/plugins/eclipse/META-INF/MANIFEST.MF	2006-11-27 23:07:41 UTC (rev 587)
@@ -17,22 +17,11 @@
  org.eclipse.core.resources,
  org.eclipse.jdt.source,
  org.eclipse.jdt.ui,
-<<<<<<< .mine
  org.eclipse.core.expressions,
  org.eclipse.jface.text,
  org.eclipse.ui.editors,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.views
-=======
- org.eclipse.core.expressions,
- org.eclipse.jface.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor
->>>>>>> .r585
 Eclipse-AutoStart: true
 Bundle-Vendor: JBehave
-<<<<<<< .mine
 Bundle-ClassPath: eclipse-plugin.jar
-=======
-Bundle-ClassPath: lib/commons-lang-1.0.1.jar
->>>>>>> .r585


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to