chore(Internal): 🔀 fixed merge conflicts

Author: WasiqB

core-java/pom.xml

@@ -4,19 +4,25 @@
   ~
   ~ Copyright (c) 2022 Wasiq Bhamla
   ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
+  ~ Permission is hereby granted,
+free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation
+files (the "Software"), to deal
+  ~ in the Software without restriction, including without
+limitation the rights
   ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
+~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so,
+subject to the following conditions:
   ~
-  ~ The above copyright notice and this permission notice shall be included in all
+  ~ The above copyright notice and this permission notice
+shall be included in all
   ~ copies or substantial portions of the Software.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    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.github.wasiqb.boyka</groupId>
     <artifactId>boyka-framework</artifactId>
@@ -207,7 +213,8 @@
             <artifactId>log4j-api</artifactId>
             <version>${log4j-api.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml -->
+        <!--
+        https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>