Revert "PPM2: select"

This reverts commit 552b7cc942
2016-12-12 23:04:04 +01:00
parent 552b7cc942
commit 8060d7af68
10 changed files with 5 additions and 340 deletions
--- a/Praktikum2/ppm1/static/functions.js
+++ b/Praktikum2/ppm1/static/functions.js
@@ -41,14 +41,6 @@ function select(category, mode) {
 function highlight(e) {
   if (selected[0]) selected[0].className = '';
   e.target.parentNode.className = 'selected';
-<<<<<<< HEAD
   var tr = e.target.parentNode;
-=======
-<<<<<<< HEAD
-   var tr = e.target.parentNode;
-=======
-   var tr = event_opl.target.parentNode;
->>>>>>> 8825fc510535fc545cb82dcdf3e43792144e6d2e
->>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
   selectedId = tr.getAttribute('id');
 }