merge

app/templates/js/script.js

@@ -241,7 +241,10 @@ $( '[name="room"]' ).change(function (e) {
 });
 
 
+<<<<<<< HEAD
 /*
+=======
+>>>>>>> 15d95dae1d1766044ec10522238bb848dff548c2
 var windowLoc = $(location).attr('pathname');
 windowLoc = windowLoc.substring(windowLoc.lastIndexOf("/"));
 console.log();
@@ -277,7 +280,13 @@ if (windowLoc == "/") {
             });
         }
     },4000);
+<<<<<<< HEAD
 }*/
+=======
+}
+
+
+>>>>>>> 15d95dae1d1766044ec10522238bb848dff548c2
 
 
 

app/views/Ajax.php

@@ -149,6 +149,7 @@ class Ajax extends Template
 			isset($_POST['action']) &&
 			$_POST['action'] != ''
 		) {
+<<<<<<< HEAD
 			$updateData = [];
 			$allDevicesData = DeviceManager::getAllDevices();
 			foreach ($allDevicesData as $deviceKey => $deviceValue) {
@@ -216,6 +217,10 @@ class Ajax extends Template
 
 			//TODO: PRO JS VRACET DATA
 			echo json_encode($updateData, JSON_PRETTY_PRINT);
+=======
+			//TODO: PRO JS VRACET DATA
+			ECHO 'test';
+>>>>>>> 15d95dae1d1766044ec10522238bb848dff548c2
 		}
 	}
 }