1 files changed, 20 insertions, 0 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java
index f938d5b3..5d7db7ba 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java
 /**
  */
 package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
@@ -15,3 +16,22 @@ package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
  */
 public interface Pseudostate extends Vertex {
 } // Pseudostate
+=======
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Pseudostate</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getPseudostate()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Pseudostate extends Vertex {
+} // Pseudostate
+>>>>>>> f1f2a1fa... Pre-realisticBranchCreation Commit:Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Pseudostate.java