Skip to content

Commit 5f61e75

Browse files
committed
#463: resolve merge issues.
1 parent a1618b2 commit 5f61e75

File tree

1 file changed

+0
-41
lines changed
  • code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build

1 file changed

+0
-41
lines changed

code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10585,47 +10585,6 @@
1058510585
<ref role="3LEDTV" node="5wLtKNeSRPD" resolve="org.iets3.core.expr.base" />
1058610586
</node>
1058710587
</node>
10588-
<node concept="3LEwk6" id="26tZ$Z4sNNn" role="2G$12L">
10589-
<property role="BnDLt" value="true" />
10590-
<property role="TrG5h" value="org.iets3.core.expr.genjava.stateMachineExample.devkit" />
10591-
<property role="3LESm3" value="1c135998-5440-4972-9921-4d69b80567f1" />
10592-
<node concept="3LEz8M" id="74GOZd5kreX" role="3LEz9a">
10593-
<ref role="3LEz8N" node="2zpAVpC$OJa" resolve="org.iets3.core.expr.genjava.advanced.devkit" />
10594-
</node>
10595-
<node concept="398BVA" id="26tZ$Z4sPb1" role="3LF7KH">
10596-
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
10597-
<node concept="2Ry0Ak" id="26tZ$Z4sRar" role="iGT6I">
10598-
<property role="2Ry0Am" value="devkits" />
10599-
<node concept="2Ry0Ak" id="26tZ$Z4sSOA" role="2Ry0An">
10600-
<property role="2Ry0Am" value="org.iets3.core.expr.genjava.stateMachineExample.devkit" />
10601-
<node concept="2Ry0Ak" id="26tZ$Z4sTv7" role="2Ry0An">
10602-
<property role="2Ry0Am" value="org.iets3.core.expr.genjava.stateMachineExample.devkit.devkit" />
10603-
</node>
10604-
</node>
10605-
</node>
10606-
</node>
10607-
<node concept="3LEDTy" id="26tZ$Z4t0sK" role="3LEDUa">
10608-
<ref role="3LEDTV" node="26tZ$Z4qXja" resolve="org.iets3.core.expr.genjava.stateMachineExample" />
10609-
</node>
10610-
<node concept="3LEDTy" id="26tZ$Z4t0sL" role="3LEDUa">
10611-
<ref role="3LEDTV" node="6JPXQMQs0pX" resolve="org.iets3.core.expr.collections" />
10612-
</node>
10613-
<node concept="3LEDTM" id="26tZ$Z4t0sN" role="3LEDUa">
10614-
<ref role="3LEDTN" node="26tZ$Z4rsyt" resolve="org.iets3.core.expr.genjava.stateMachineExample.genplan" />
10615-
</node>
10616-
<node concept="3LEDTy" id="3vxfdxbuHow" role="3LEDUa">
10617-
<ref role="3LEDTV" node="5wLtKNeSRQd" resolve="org.iets3.core.expr.simpleTypes" />
10618-
</node>
10619-
<node concept="3LEDTy" id="121_t0FdgAJ" role="3LEDUa">
10620-
<ref role="3LEDTV" node="26tZ$Z4qVBy" resolve="org.iets3.core.expr.genjava.simpleTypes" />
10621-
</node>
10622-
<node concept="3LEDTy" id="121_t0FdgAK" role="3LEDUa">
10623-
<ref role="3LEDTV" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
10624-
</node>
10625-
<node concept="3LEDTy" id="121_t0FdgAL" role="3LEDUa">
10626-
<ref role="3LEDTV" node="26tZ$Z4qSzW" resolve="org.iets3.core.expr.genjava.base" />
10627-
</node>
10628-
</node>
1062910588
</node>
1063010589
<node concept="2G$12M" id="7$nPgK7yqIF" role="3989C9">
1063110590
<property role="TrG5h" value="iets3.comp.os" />

0 commit comments

Comments
 (0)