diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2020-06-06 19:19:18 -0400 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2020-06-07 19:47:46 -0400 |
commit | 8a5c12d1c52498ad9abc11057f6c23456e272585 (patch) | |
tree | e85bde3d0fb911d1b2ed7f4151e1b3010bd517dd /Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF | |
parent | VAMPIRE: last commit (diff) | |
download | VIATRA-Generator-8a5c12d1c52498ad9abc11057f6c23456e272585.tar.gz VIATRA-Generator-8a5c12d1c52498ad9abc11057f6c23456e272585.tar.zst VIATRA-Generator-8a5c12d1c52498ad9abc11057f6c23456e272585.zip |
VAMPIRE: Rebase on Master
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF')
-rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF | 6 |
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, | |||
22 | hu.bme.mit.inf.dslreasoner.workspace | 22 | hu.bme.mit.inf.dslreasoner.workspace |
23 | Require-Bundle: org.eclipse.core.runtime, | 23 | Require-Bundle: org.eclipse.core.runtime, |
24 | <<<<<<< HEAD | 24 | <<<<<<< HEAD |
25 | <<<<<<< HEAD | ||
26 | ======= | ||
27 | >>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master | ||
25 | org.eclipse.emf.ecore;visibility:=reexport, | 28 | org.eclipse.emf.ecore;visibility:=reexport, |
26 | com.google.guava, | 29 | com.google.guava, |
27 | org.eclipse.xtend.lib, | 30 | org.eclipse.xtend.lib, |
@@ -30,6 +33,7 @@ Require-Bundle: org.eclipse.core.runtime, | |||
30 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", | 33 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", |
31 | org.apache.commons.lang;bundle-version="2.6.0", | 34 | org.apache.commons.lang;bundle-version="2.6.0", |
32 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" | 35 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" |
36 | <<<<<<< HEAD | ||
33 | ======= | 37 | ======= |
34 | org.eclipse.emf.ecore;visibility:=reexport, | 38 | org.eclipse.emf.ecore;visibility:=reexport, |
35 | com.google.guava, | 39 | com.google.guava, |
@@ -39,6 +43,8 @@ Require-Bundle: org.eclipse.core.runtime, | |||
39 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", | 43 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", |
40 | org.apache.commons.lang;bundle-version="2.6.0", | 44 | org.apache.commons.lang;bundle-version="2.6.0", |
41 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" | 45 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" |
46 | ======= | ||
47 | >>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master | ||
42 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 48 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
43 | Bundle-ActivationPolicy: lazy | 49 | Bundle-ActivationPolicy: lazy |
44 | >>>>>>> b42fb751... Add gitignore, commit everything | 50 | >>>>>>> b42fb751... Add gitignore, commit everything |