]> gerrit.simantics Code Review - simantics/interop.git/commit
Git acting up, and conflicting itself. This is a fix
authorMarko Luukkainen <marko.luukkainen@vtt.fi>
Tue, 21 Feb 2017 10:47:10 +0000 (12:47 +0200)
committerMarko Luukkainen <marko.luukkainen@vtt.fi>
Tue, 21 Feb 2017 10:47:10 +0000 (12:47 +0200)
commit1e5befdca54cd12daed18b964da34a5902c02bac
treec031219dfd73cdd7c2a89215ba3242d219b6d4b3
parent9b518092a4217216dbe2a8b90c5aaad1d1e4ec21
Git acting up, and conflicting itself. This is a fix

refs #7045

Change-Id: Idbf8d79ec9dce3136f9dc85acf8675ab05911d83
org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java
org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java