Add gitignore, commit everything

3 files changed, 16 insertions, 4 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/.classpath b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/.classpath
index e84a3295..a9e661c7 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/.classpath
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/.classpath
@@ -7,5 +7,6 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

         <classpathentry kind="src" path="src"/>

+        <classpathentry kind="src" path="src-gen/"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

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 338e8c09..878247b1 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
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.logic.model;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,
@@ -22,6 +21,7 @@ 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
  org.eclipse.emf.ecore;visibility:=reexport,
  com.google.guava,
  org.eclipse.xtend.lib,
@@ -30,7 +30,17 @@ 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"
+=======
+  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"
+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
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/build.properties b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/build.properties
index 9403fc5f..c18a0403 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/build.properties
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/build.properties
@@ -8,5 +8,6 @@ source.. = ecore-gen/,\
            src/,\

            xtend-gen/,\

            patterns/,\

-           vql-gen/

+           vql-gen/,\

+           src-gen/

 output.. = bin/