1 files changed, 0 insertions, 17 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 c3f42035..4c71a872 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
@@ -21,10 +21,6 @@ Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,
  hu.bme.mit.inf.dslreasoner.util,
  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,
@@ -33,20 +29,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,
-  org.eclipse.xtend.lib,
-  org.eclipse.xtext.xbase.lib,
-  org.eclipse.core.resources;bundle-version="3.8.101",
-  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
 Import-Package: org.apache.log4j
 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic.model