From 8dbbb1fd68939f8c1238c40ba05b83223d51ffaf Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Sun, 28 Aug 2022 16:39:31 -0400 Subject: hopefully fix my discarded changes --- .../java/com/aizistral/nochatreports/config/ModMenuIntegration.java | 2 +- src/main/resources/assets/nochatreports/lang/en_us.json | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src') 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 -- cgit v1.2.3