❌ Remove header

Maseshi · Aug 10, 2022 · 11ef0d3 · 11ef0d3
1 parent a2d7cbc
commit 11ef0d3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/source/languages/en.json b/source/languages/en.json
@@ -386,11 +386,7 @@
         },
         "ping": {
             "connection": "📡 Connection",
-<<<<<<< HEAD
             "info": "Ping is %s1 seconds \nRoundtrip Latency is %s2 seconds",
-=======
-            "info": "Ping is %s1ms \nAPI Latency is %s2ms",
->>>>>>> 61f03dcae89b21c1291a9d2c2fdc032117be3828
             "result": "🏓 Pong",
             "waiting": "🏓 Pinging..."
         },