Pre-realisticBranchCreation Commit

1 files changed, 45 insertions, 0 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/CompositeElement.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/CompositeElement.java
index cf2949d8..4565a3b9 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/CompositeElement.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/CompositeElement.java
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/CompositeElement.java
 /**
  */
 package ca.mcgill.ecse.dslreasoner.vampire.yakindumm;
@@ -40,3 +41,47 @@ public interface CompositeElement extends EObject {
         EList<Region> getRegions();
 
 } // CompositeElement
+=======
+/**
+ */
+package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Composite Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement#getRegions <em>Regions</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getCompositeElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CompositeElement extends EObject {
+        /**
+         * Returns the value of the '<em><b>Regions</b></em>' containment reference list.
+         * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Regions</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Regions</em>' containment reference list.
+         * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getCompositeElement_Regions()
+         * @model containment="true"
+         * @generated
+         */
+        EList<Region> getRegions();
+
+} // CompositeElement
+>>>>>>> f1f2a1fa... Pre-realisticBranchCreation Commit:Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/CompositeElement.java