Fix conflicts

Thiébaud Modoux · Thiébaud Modoux · commit 84339bcdd161 · 2018-08-22T09:35:00.000+02:00
diff --git a/connector.js b/connector.js
@@ -58,10 +58,7 @@
     }
   }
   
-<<<<<<< HEAD
-=======
   // Initialize date and limit selectors
->>>>>>> master
   function initSelectors() {
     var currentDate = new Date();
     var currentYear = currentDate.getFullYear();

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,7 @@`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`-<<<<<<< HEAD`
`62`		`-=======`
`63`	`61`	`// Initialize date and limit selectors`
`64`		`->>>>>>> master`
`65`	`62`	`function initSelectors() {`
`66`	`63`	`var currentDate = new Date();`
`67`	`64`	`var currentYear = currentDate.getFullYear();`