Fixing merge conflict

MegaMek · Dec 31, 2021 · 43b2e10 · 43b2e10
1 parent dfa166e
commit 43b2e10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/MekHQ/build.gradle b/MekHQ/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     implementation 'org.joda:joda-money:1.0.1'
     implementation 'org.apache.commons:commons-text:1.4'
     implementation 'org.apache.commons:commons-csv:1.4'
-    implementation 'org.apache.logging.log4j:log4j-core:2.17.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
     implementation 'javax.vecmath:vecmath:1.5.2'
     implementation 'com.atlassian.commonmark:commonmark:0.13.0'
 

diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt
@@ -17,7 +17,7 @@ VERSION HISTORY:
 + PR #2345: Refactor equipment unscrambling to make it testable
 + PR #2991: Updating Mockito to 4.1.0
 + PR #2986: Fixing Unit Market Preference Copy/Paste Error
-+ PR #3002: Log4j2 2.17.0 Swapover From Log4j1 1.2.17
++ PR #3002: Log4j2 2.17.1 Swapover From Log4j1 1.2.17
 + PR #3004: JUnit Update to 4.13.2 from 4.12
 + Issue #2863: Adding Dates Personnel Tab Filter, Displaying Dates, and adding Pregnancy Colour
 + PR #2851: Personnel Modules: Marriage: Modularization and Expanded Options