SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

merge

Browse Source
This commit is contained in:
unknown
2020-02-18 21:31:37 +01:00
parent 5a06a6c85a 15d95dae1d
commit c43b751bd3
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/templates/js/script.js
View File

@@ -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