Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/master 9fdd5dae7 -> 28d81b959
Merged. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/28d81b95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/28d81b95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/28d81b95 Branch: refs/heads/master Commit: 28d81b959a85037f5198aa30f1cca10748c6bf83 Parents: 9fdd5da Author: Anatole Tresch <[email protected]> Authored: Thu Sep 28 22:17:17 2017 +0200 Committer: Anatole Tresch <[email protected]> Committed: Thu Sep 28 22:17:17 2017 +0200 ---------------------------------------------------------------------- osgi/pom.xml | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/28d81b95/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/pom.xml b/osgi/pom.xml index 1451957..9f0edf9 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -25,10 +25,7 @@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-osgi-all</artifactId>
