fix merging issue

5 files changed, 41 insertions, 37 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
index d888605f..2db7ed24 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
index 093b7865..e89404f0 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore
index 1089c736..c41377d5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore
@@ -1,2 +1,6 @@
 /.ApplicationConfigurationIdeModule.java._trace
 /.ApplicationConfigurationIdeSetup.java._trace
+/.ApplicationConfigurationIdeModule.xtendbin
+/.ApplicationConfigurationIdeSetup.xtendbin
+/ApplicationConfigurationIdeModule.java
+/ApplicationConfigurationIdeSetup.java
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java
index 34f65780..f4d40594 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java
@@ -1,13 +1,13 @@
-/**

- * generated by Xtext 2.12.0

- */

-package hu.bme.mit.inf.dslreasoner.application.ide;

-

-import hu.bme.mit.inf.dslreasoner.application.ide.AbstractApplicationConfigurationIdeModule;

-

-/**

- * Use this class to register ide components.

- */

-@SuppressWarnings("all")

-public class ApplicationConfigurationIdeModule extends AbstractApplicationConfigurationIdeModule {

-}

+/**
+ * generated by Xtext 2.12.0
+ */
+package hu.bme.mit.inf.dslreasoner.application.ide;
+
+import hu.bme.mit.inf.dslreasoner.application.ide.AbstractApplicationConfigurationIdeModule;
+
+/**
+ * Use this class to register ide components.
+ */
+@SuppressWarnings("all")
+public class ApplicationConfigurationIdeModule extends AbstractApplicationConfigurationIdeModule {
+}
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java
index a73d3f1f..2281147c 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java
@@ -1,24 +1,24 @@
-/**

- * generated by Xtext 2.12.0

- */

-package hu.bme.mit.inf.dslreasoner.application.ide;

-

-import com.google.inject.Guice;

-import com.google.inject.Injector;

-import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule;

-import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationStandaloneSetup;

-import hu.bme.mit.inf.dslreasoner.application.ide.ApplicationConfigurationIdeModule;

-import org.eclipse.xtext.util.Modules2;

-

-/**

- * Initialization support for running Xtext languages as language servers.

- */

-@SuppressWarnings("all")

-public class ApplicationConfigurationIdeSetup extends ApplicationConfigurationStandaloneSetup {

-  @Override

-  public Injector createInjector() {

-    ApplicationConfigurationRuntimeModule _applicationConfigurationRuntimeModule = new ApplicationConfigurationRuntimeModule();

-    ApplicationConfigurationIdeModule _applicationConfigurationIdeModule = new ApplicationConfigurationIdeModule();

-    return Guice.createInjector(Modules2.mixin(_applicationConfigurationRuntimeModule, _applicationConfigurationIdeModule));

-  }

-}

+/**
+ * generated by Xtext 2.12.0
+ */
+package hu.bme.mit.inf.dslreasoner.application.ide;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule;
+import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationStandaloneSetup;
+import hu.bme.mit.inf.dslreasoner.application.ide.ApplicationConfigurationIdeModule;
+import org.eclipse.xtext.util.Modules2;
+
+/**
+ * Initialization support for running Xtext languages as language servers.
+ */
+@SuppressWarnings("all")
+public class ApplicationConfigurationIdeSetup extends ApplicationConfigurationStandaloneSetup {
+  @Override
+  public Injector createInjector() {
+    ApplicationConfigurationRuntimeModule _applicationConfigurationRuntimeModule = new ApplicationConfigurationRuntimeModule();
+    ApplicationConfigurationIdeModule _applicationConfigurationIdeModule = new ApplicationConfigurationIdeModule();
+    return Guice.createInjector(Modules2.mixin(_applicationConfigurationRuntimeModule, _applicationConfigurationIdeModule));
+  }
+}