zendalona
diff --git a/‎.gitattributes
+1 b/‎.gitattributes
+1
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎public/js/0.js
-1 b/‎public/js/0.js
-1
diff --git a/‎public/js/1.js
-94 b/‎public/js/1.js
-94
diff --git a/‎public/js/5.js
-50 b/‎public/js/5.js
-50
diff --git a/‎public/js/6.js
-21 b/‎public/js/6.js
-21
diff --git a/‎public/js/7.js
-15 b/‎public/js/7.js
-15
diff --git a/‎public/js/truRequire.js
-62 b/‎public/js/truRequire.js
-62
diff --git a/‎public/js/trudesk.min.js
-1 b/‎public/js/trudesk.min.js
-1
diff --git a/‎public/js/vendor.js
-56 b/‎public/js/vendor.js
-56
@@ -0,0 +1 @@
+.gitignore merge=ours
@@ -47,6 +47,7 @@ private/
 /coverage/
 /plugins/
 config.local.json
+public/js/
 public/css/app.min.css
 public/css/app.css
 *.aws