Author: ruschein
Date: 2011-02-14 13:10:37 -0800 (Mon, 14 Feb 2011)
New Revision: 24115
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Fixed merge conflict.
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-02-12 02:10:46 UTC (rev 24114)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-02-14 21:10:37 UTC (rev 24115)
@@ -587,7 +587,6 @@
<entry key="menuLabel" value="Rename column" />
</osgi:service-properties>
</osgi:service>
-<<<<<<< .mine
<osgi:service id="copyValueToEntireColumnTaskFactoryService"
ref="copyValueToEntireColumnTaskFactory"
interface="org.cytoscape.task.table.TableCellTaskFactory">
@@ -595,11 +594,8 @@
<entry key="menuLabel" value="Copy to entire column" />
</osgi:service-properties>
</osgi:service>
-=======
<osgi:service id="deleteTableTaskFactoryService"
ref="deleteTableTaskFactory"
interface="org.cytoscape.task.table.TableTaskFactory">
</osgi:service>
-
->>>>>>> .r24108
</beans>
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
