1 files changed, 40 insertions, 0 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StatechartImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StatechartImpl.java
index 0b48e8d8..3386a99b 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StatechartImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StatechartImpl.java
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/StatechartImpl.java
 /**
  */
 package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
@@ -35,3 +36,42 @@ public class StatechartImpl extends CompositeElementImpl implements Statechart {
         }
 
 } //StatechartImpl
+=======
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;
+
+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Statechart;
+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Statechart</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class StatechartImpl extends CompositeElementImpl implements Statechart {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected StatechartImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakinduPackage.Literals.STATECHART;
+        }
+
+} //StatechartImpl
+>>>>>>> f1f2a1fa... Pre-realisticBranchCreation Commit:Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/StatechartImpl.java