Commit 2bc1a3da authored by André Pacak's avatar André Pacak
Browse files

fix merge

parent 15af2bd0
......@@ -14,6 +14,7 @@
<dependency reexport="false">08d23328-33fa-47ce-89df-daaa7554f251(sum.lang)</dependency>
<dependency reexport="false">85035970-2cea-4190-979b-40e09340050d(product.lang)</dependency>
<dependency reexport="false">b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</dependency>
<dependency reexport="false">f11c2e83-66b2-4c36-ae0f-9c8bd1f4a9c2(pcf.universal.ext)</dependency>
</dependencies>
<languageVersions>
<language slang="l:ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71:TypeLang" version="0" />
......@@ -35,6 +36,7 @@
<language slang="l:8c9a2720-9d21-4370-a226-819eb3e76e1e:org.inca.fun" version="0" />
<language slang="l:cd2909da-ecb4-49dc-b176-33e5c619e516:org.inca.gp" version="0" />
<language slang="l:5a551d67-ba3f-49dc-b984-2ea4f8c9ad07:pcf.lang" version="0" />
<language slang="l:f11c2e83-66b2-4c36-ae0f-9c8bd1f4a9c2:pcf.universal.ext" version="-1" />
<language slang="l:85035970-2cea-4190-979b-40e09340050d:product.lang" version="0" />
<language slang="l:08d23328-33fa-47ce-89df-daaa7554f251:sum.lang" version="0" />
</languageVersions>
......@@ -67,6 +69,7 @@
<module reference="8c9a2720-9d21-4370-a226-819eb3e76e1e(org.inca.fun)" version="0" />
<module reference="cd2909da-ecb4-49dc-b176-33e5c619e516(org.inca.gp)" version="0" />
<module reference="5a551d67-ba3f-49dc-b984-2ea4f8c9ad07(pcf.lang)" version="0" />
<module reference="f11c2e83-66b2-4c36-ae0f-9c8bd1f4a9c2(pcf.universal.ext)" version="0" />
<module reference="85035970-2cea-4190-979b-40e09340050d(product.lang)" version="0" />
<module reference="f7521a8a-f887-420a-b23b-8fffa9357b8f(stlcn.lang)" version="0" />
<module reference="08d23328-33fa-47ce-89df-daaa7554f251(sum.lang)" version="0" />
......
......@@ -3,6 +3,7 @@
<persistence version="9" />
<languages>
<use id="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71" name="TypeLang" version="0" />
<use id="f11c2e83-66b2-4c36-ae0f-9c8bd1f4a9c2" name="pcf.universal.ext" version="-1" />
</languages>
<imports>
<import index="bpp8" ref="r:f2d828c1-c3d0-412d-8424-6d58773c0f68(pcf.universal.ext.structure)" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment