Resolved merge conflict

1 files changed, 0 insertions, 31 deletions

diff --git a/sourcecodes/scripts/accordion.js~ b/sourcecodes/scripts/accordion.js~
deleted file mode 100644
index 51949b96..00000000
--- a/sourcecodes/scripts/accordion.js~
+++ /dev/null
@@ -1,31 +0,0 @@
-$(function() {
-var acc = document.getElementsByClassName("accordion");
-var panel = document.getElementsByClassName("panel");
-var icons = document.getElementsByClassName("i");
-var i;
-
-for (var i = 0; i < acc.length; i++) {
-    acc[i].onclick = function() {
-	var setClasses = !this.classList.contains('active');
-	setClass(acc, 'active', 'remove');
-	setClass(panel, 'show', 'remove');
-	if (setClasses) {
-	    this.classList.toggle("active");
-	    this.nextElementSibling.classList.toggle("show");
-	}
-    }
-}
-
-function setClass(els, className, fnName) {
-    for (var i = 0; i < els.length; i++) {
-	els[i].classList[fnName](className);
-    }
-}
-
-$('button').click(function() {
-	$('i').not($(this).find('i')).removeClass('fa-minus')
-	    $('i').not($(this).find('i')).addClass('fa-plus')
-	    $(this).find('i').toggleClass('fa-plus fa-minus')
-	    });
-    }
-   )
\ No newline at end of file