Update pom.xml

Gaurav000001 · Jul 12, 2023 · 635e431 · 635e431
1 parent 9a804fa
commit 635e431
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/AmusementParkManagementSystem/pom.xml b/AmusementParkManagementSystem/pom.xml
@@ -81,25 +81,11 @@
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter</artifactId>
  </dependency>
-<<<<<<< HEAD
- <!--<dependency>
+ <!--<dependency>
  <groupId>com.h2database</groupId>
  <artifactId>h2</artifactId>
  <scope>runtime</scope>
- </dependency>-->
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>runtime</scope>
- </dependency>
-=======
-<!-- <dependency>-->
-<!-- <groupId>com.h2database</groupId>-->
-<!-- <artifactId>h2</artifactId>-->
-<!-- <scope>runtime</scope>-->
-<!-- </dependency>-->
->>>>>>> 1751f81c0b8c1501de2405c071cb8f464002eccc
+ </dependency>-->
  </dependencies>
  <build>
  <plugins>