Merge Logal to remote

2020-09-02 19:47:07 +02:00
parent 3c456caeca 960859087a
commit 77d6e795d6
2 changed files with 4 additions and 68 deletions
--- a/app/views/templates/device.phtml
+++ b/app/views/templates/device.phtml
@@ -1,5 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5cb6f0b... Some Fixes
 <head>
 	<?php
 	$partial = new Partial('head');