X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FAddDeleteUpdateOp.java;h=901dc19ecbd027b25eead4cf6cc73efab4a82d18;hb=e2f57d7e61d6c52b6341f793f6988c123daa1647;hp=04d15844ae89f6fe14b41b3f4a12293b40147daf;hpb=9b518092a4217216dbe2a8b90c5aaad1d1e4ec21;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java
index 04d1584..901dc19 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java
@@ -17,11 +17,8 @@ import org.simantics.layer0.Layer0;
 
 public abstract class AddDeleteUpdateOp extends UpdateOp {
 	
-<<<<<<< HEAD
 	protected boolean add;
-=======
-	boolean add;
->>>>>>> branch 'master' of ssh://luukkainen@www.simantics.org:29418/simantics/interop
+
 	
 	public AddDeleteUpdateOp(GraphChanges changes) {
 		super(changes);