Merge branch 'master' of

[simantics/interop.git] / org.simantics.interop.update / src / org / simantics / interop / update / model / AddDeleteUpdateOp.java

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 e32ebd0fcac31c3efad201b453187c71aa0a4dc8..04d15844ae89f6fe14b41b3f4a12293b40147daf 100644 (file)
--- 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,7 +17,11 @@ 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);