Sync

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