[MOSIP-37358]Update readme

Signed-off-by: JanardhanBS-SyncByte <[email protected]>
mosip · Nov 25, 2024 · 7c2d1c5 · 7c2d1c5
1 parent bd390da
commit 7c2d1c5
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,8 @@
-<<<<<<< HEAD
 .idea
-=======
->>>>>>> 7b4602c ([MOSIP-33316] Merge develop from develop-java21)
 /.metadata/
 .sonarlint/
 */.classpath
 */.gitignore
 */.project
-<<<<<<< HEAD
 */.settings/
-*/target/
-=======
-*/.settings/
->>>>>>> 7b4602c ([MOSIP-33316] Merge develop from develop-java21)
+*/target/