From fcad3b0db48b45a7769c2934911f79307c103990 Mon Sep 17 00:00:00 2001
From: ArenBabikian <aren.babikian@mail.mcgill.ca>
Date: Sun, 12 May 2019 22:27:13 -0400
Subject: Pre-realisticBranchCreation Commit

---
 .../dslreasoner/vampire/yakindumm/FinalState.java    | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java')

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java
index bcc20dfd..cb947fab 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/FinalState.java
 /**
  */
 package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
@@ -15,3 +16,22 @@ package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
  */
 public interface FinalState extends RegularState {
 } // FinalState
+=======
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Final State</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getFinalState()
+ * @model
+ * @generated
+ */
+public interface FinalState extends RegularState {
+} // FinalState
+>>>>>>> f1f2a1fa... Pre-realisticBranchCreation Commit:Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/FinalState.java
-- 
cgit v1.2.3-70-g09d2