Add autocompleting usernames with @ symbol publiclab#2913, updates af…

…ter upstream fetch and rebase in feature branch
cheneyshreve01 · Jun 26, 2018 · bc0797a · bc0797a
1 parent 3d5fa7e
commit bc0797a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -55,10 +55,6 @@
 //= require header_footer.js
 //= require jquery.atwho
 //  require turbolinks // Temporarily removed while fixing
-<<<<<<< HEAD
-=======
 //= require noty/lib/noty.js
 //= require noty_notification.js
 //= require jquery-confirm/js/jquery-confirm.js
-
->>>>>>> upstream/master