1 files changed, 21 insertions, 0 deletions

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
index 04702ac5..d4dfa1c9 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
@@ -1,6 +1,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?><plugin>
   <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.transima.fam.model" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">
     <wellbehaving-derived-feature classifier-name="FunctionalElement" feature-name="model" package-nsUri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>
@@ -78,3 +79,23 @@
   </extension>
 </plugin>
 >>>>>>> 5d1165ce... VAMPIRE: Implement Vampire measurement code
+=======
+<?xml version="1.0" encoding="UTF-8"?><plugin>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated FamMetamodel -->
+      <package
+            uri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"
+            class="functionalarchitecture.FunctionalarchitecturePackage"
+            genModel="model/FamMetamodel.genmodel"/>
+   </extension>
+  <extension id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">
+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns">
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.terminatorAndInformation"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.rootElements"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.parent"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"/>
+    </group>
+  </extension>
+</plugin>
+>>>>>>> 4d27f278... VAMPIRE: last commit