From ba630b4de2a053cb56761e79101cefbaaedb6f1f Mon Sep 17 00:00:00 2001
From: Eng1n33r <101719414+Eng1n33r@users.noreply.github.com>
Date: Wed, 13 Jul 2022 16:20:54 +0300
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/dev' into dev"

This reverts commit 528a8dbad8189349f885c187b5f025a0ffdff68f.
---
 assets/resources/Manifest | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/assets/resources/Manifest b/assets/resources/Manifest
index ab4abb2ae..05c07fac0 100644
--- a/assets/resources/Manifest
+++ b/assets/resources/Manifest
@@ -1,9 +1,5 @@
 V:0
-<<<<<<< HEAD
 T:1657662154
-=======
-T:1657672575
->>>>>>> dev
 D:badusb
 D:dolphin
 D:infrared