Merged trunk@30110, @30126, @30139, @30147, @30190, @30206, @30230, @30233 to branche...

refs #5178
refs #5197
refs #5227
refs #5261
refs #5278
refs #5275

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@30426 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
index 5c7ac3de05f526d79df3a2c70364da1fb70cc3b8..7bf5b1ff40172fa90bfb75dcd114cf9cdb44ee79 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
@@ -154,13 +154,9 @@ public class SysdynExperiments {
     }\r
 \r
        private static void processChild(ReadGraph graph, Variable child, PartialIC IC) throws DatabaseException {\r
-<<<<<<< .working\r
 \r
-=======\r
-               \r
                StructuralResource2 STR = StructuralResource2.getInstance(graph);\r
-               \r
->>>>>>> .merge-right.r30389\r
+\r
                for(Variable c : child.getChildren(graph)) {\r
                        Resource type = c.getPossibleType(graph);\r
                        if(type == null) continue;\r