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/PseudostateImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/PseudostateImpl.java
index b8c76c27..66be23f2 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/PseudostateImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/PseudostateImpl.java
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/impl/PseudostateImpl.java
 /**
  */
 package ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl;
@@ -35,3 +36,42 @@ public abstract class PseudostateImpl extends VertexImpl implements Pseudostate
         }
 
 } //PseudostateImpl
+=======
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;
+
+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Pseudostate;
+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>Pseudostate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class PseudostateImpl extends VertexImpl implements Pseudostate {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected PseudostateImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return YakinduPackage.Literals.PSEUDOSTATE;
+        }
+
+} //PseudostateImpl
+>>>>>>> f1f2a1fa... Pre-realisticBranchCreation Commit:Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/PseudostateImpl.java