Author: fmancinelli
Date: 2008-02-07 21:47:03 +0100 (Thu, 07 Feb 2008)
New Revision: 7357
Added:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/model/impl/ConflictData.java
Log:
XECLIPSE-81
Added a missing file
Added:
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/model/impl/ConflictData.java
===================================================================
---
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/model/impl/ConflictData.java
(rev 0)
+++
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/eclipse/model/impl/ConflictData.java
2008-02-07 20:47:03 UTC (rev 7357)
@@ -0,0 +1,26 @@
+package org.xwiki.eclipse.model.impl;
+
+import java.io.Serializable;
+
+public class ConflictData implements Serializable {
+ private static final long serialVersionUID = -7999756414069939507L;
+
+ private String localContent;
+ private String remoteContent;
+
+ public ConflictData(String localContent, String remoteContent) {
+ this.localContent = localContent;
+ this.remoteContent = remoteContent;
+ }
+
+ public String getLocalContent() {
+ return localContent;
+ }
+
+ public String getRemoteContent() {
+ return remoteContent;
+ }
+
+
+
+}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
