[sling-org-apache-sling-feature-diff] branch master updated: SLING-11718 : Migrate to Jakarta JSON API

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-diff.git


The following commit(s) were added to refs/heads/master by this push:
     new 0a7fcb0  SLING-11718 : Migrate to Jakarta JSON API
0a7fcb0 is described below

commit 0a7fcb0d56d3b2aabcd6c0a12420b6efa522d8a5
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Dec 6 09:08:51 2022 +0100

    SLING-11718 : Migrate to Jakarta JSON API
---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9f2c8ca..87c1d4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,8 @@
         <relativePath />
     </parent>
 
-<<<<<<< HEAD
     <artifactId>org.apache.sling.feature.diff</artifactId>
-    <version>0.0.7-SNAPSHOT</version>
-=======
-  <artifactId>org.apache.sling.feature.diff</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
->>>>>>> 8376f9f (SLING-11718 : Migrate to Jakarta JSON API)
+    <version>0.1.0-SNAPSHOT</version>
 
     <name>Apache Sling Feature Model diff tool</name>
     <description>Feature Model diff tool for Apache Sling</description>