From d2cea2ef063383ec62b3cb85f496c1154a63fd6d Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Sun, 13 Mar 2022 14:53:36 +0530
Subject: [PATCH] resolve conflicts

---
 spring-security-modules/spring-security-web-boot-3/pom.xml | 5 ++---
 testing-modules/testng_command_line/pom.xml                | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/spring-security-modules/spring-security-web-boot-3/pom.xml b/spring-security-modules/spring-security-web-boot-3/pom.xml
index 59fcf9949f..5f2a455294 100644
--- a/spring-security-modules/spring-security-web-boot-3/pom.xml
+++ b/spring-security-modules/spring-security-web-boot-3/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-security-web-boot-3</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -65,4 +63,5 @@
         <jquery.version>3.6.0</jquery.version>
     </properties>
 
+
 </project>
\ No newline at end of file
diff --git a/testing-modules/testng_command_line/pom.xml b/testing-modules/testng_command_line/pom.xml
index 0f3201a432..4c3af7621c 100644
--- a/testing-modules/testng_command_line/pom.xml
+++ b/testing-modules/testng_command_line/pom.xml
@@ -3,10 +3,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>com.baeldung.testing_modules</groupId>
     <artifactId>testng_command_line</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>testing-modules</artifactId>
@@ -78,6 +78,7 @@
                 </pluginManagement>
             </build>
         </profile>
+
         <profile>
             <id>ExecuteTestSuite</id>
             <activation>
@@ -100,7 +101,6 @@
             </build>
         </profile>
     </profiles>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -112,5 +112,4 @@
         <maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
         <maven.surefire.plugin.version>2.22.1</maven.surefire.plugin.version>
     </properties>
-
-</project>
\ No newline at end of file
+</project>