From 11ef0d3193f3cf4b780c4a378fdcfedb5c83a5f4 Mon Sep 17 00:00:00 2001
From: Maseshi <dermhioasw123@gmail.com>
Date: Wed, 10 Aug 2022 18:50:16 +0700
Subject: [PATCH] =?UTF-8?q?=E2=9D=8C=20Remove=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/languages/en.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source/languages/en.json b/source/languages/en.json
index e0822cd5..612664d9 100644
--- 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..."
         },