kristjank/TeraHz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'buster' of github.com:cls-02/TeraHz into buster

Browse Source
This commit is contained in:
Kristjan Komlosi
2019-11-01 19:56:40 +01:00
parent c2b0722d3a e4522f11b7
commit 63ee66fb6d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/frontend.js
View File

@@ -13,8 +13,12 @@ function updateData () {
timeout: 2500 // this should be a pretty sane timeout timeout: 2500 // this should be a pretty sane timeout
}).done( }).done(
document.write(globalObject) document.write(globalObject)
<<<<<<< HEAD
); // INSERT THE DATA HANDLER HERE!!! ); // INSERT THE DATA HANDLER HERE!!!
} }
=======
) // INSERT THE DATA HANDLER HERE!!!
>>>>>>> e4522f11b76f89c9bb6ef2c93f09b17877b11b9c
function fillTable (obj, dom) { function fillTable (obj, dom) {
// applies data in obj[0] to HTML tags with the obj's key as ID. // applies data in obj[0] to HTML tags with the obj's key as ID.