Fix merge bug

cdedbb2a · csillag · 37877e1c · cdedbb2a
Commit cdedbb2a authored Aug 12, 2013 by csillag
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

controllers.coffee h/js/controllers.coffee +0 -1

No files found.
--- a/h/js/controllers.coffee
+++ b/h/js/controllers.coffee
@@ -246,7 +246,6 @@ class App
    $scope.createUnattachedAnnotation = ->
      console.log "Should create unattached annotation"

-<<<<<<< HEAD
    # Searchbar initialization
    @user_filter = $filter('userName')
    search_query = ''