1 files changed, 6 insertions, 0 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
index 878247b1..c3f42035 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
@@ -22,6 +22,9 @@ Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,
  hu.bme.mit.inf.dslreasoner.workspace
 Require-Bundle: org.eclipse.core.runtime,
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master
  org.eclipse.emf.ecore;visibility:=reexport,
  com.google.guava,
  org.eclipse.xtend.lib,
@@ -30,6 +33,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.viatra.query.runtime;bundle-version="1.3.0",
  org.apache.commons.lang;bundle-version="2.6.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.13.0"
+<<<<<<< HEAD
 =======
   org.eclipse.emf.ecore;visibility:=reexport,
   com.google.guava,
@@ -39,6 +43,8 @@ Require-Bundle: org.eclipse.core.runtime,
   org.eclipse.viatra.query.runtime;bundle-version="1.3.0",
   org.apache.commons.lang;bundle-version="2.6.0",
   org.eclipse.emf.ecore.xmi;bundle-version="2.13.0"
+=======
+>>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 >>>>>>> b42fb751... Add gitignore, commit everything