From fc3d3d59305c79c4fe5b00e89f07ebc0e145c3f7 Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Wed, 2 Sep 2020 21:15:00 +0200 Subject: [PATCH] Sync --- app/views/templates/device.phtml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml index 28b18e2..367f930 100644 --- a/app/views/templates/device.phtml +++ b/app/views/templates/device.phtml @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> 5cb6f0b... Some Fixes