summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMODKILLER10012022-08-28 16:39:31 -0400
committerMODKILLER10012022-08-28 16:39:31 -0400
commit8dbbb1fd68939f8c1238c40ba05b83223d51ffaf (patch)
tree64e5e8bce6e1203c0c371029dd46ab6b45ca7214 /src
parentbdf7fe62a84cd1f2b254c8829b1669c8be47de16 (diff)
hopefully fix my discarded changes
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java2
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json5
2 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
index 2b6d3f9..f48fb31 100644
--- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
@@ -206,4 +206,4 @@ public final class ModMenuIntegration implements ModMenuApi {
};
}
-}
+} \ No newline at end of file
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index 351751c..e50f25e 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -58,7 +58,6 @@
"option.NoChatReports.whitelistedServers.addButtonTooltip": "Add server",
"option.NoChatReports.whitelistedServers.removeButtonTooltip": "Remove selected server",
"option.NoChatReports.whitelistedServers.instructions": "Click the + to add a server. Click the - to remove the selected server.",
-<<<<<<< HEAD
"option.NoChatReports.whitelistedServers.serverAddress": "Click here to edit server address",
"configuration.NoChatReports.category.lanOptions": "LAN Options",
@@ -70,7 +69,3 @@
"option.NoChatReports.addQueryData": "Add query data",
"option.NoChatReports.addQueryData.tooltip": "Allows the server to send additional data to client when handling pings. This is used for displaying \"Safe Server\" icon, as well as some other technical purposes."
}
-=======
- "option.NoChatReports.whitelistedServers.serverAddress": "Click here to edit server address"
-}
->>>>>>> b866000650d995a1095aaf5ccbd4b855df6bc9d1