Skip to content

C
coopwire-hypothesis
Commit cdedbb2a authored by csillag's avatar csillag
Browse files
Options

Fix merge bug

parent 37877e1c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
h/js/controllers.coffee
View file @ cdedbb2a
...@@ -246,7 +246,6 @@ class App ...@@ -246,7 +246,6 @@ class App
$scope.createUnattachedAnnotation = -> $scope.createUnattachedAnnotation = ->
console.log "Should create unattached annotation" console.log "Should create unattached annotation"
<<<<<<< HEAD
# Searchbar initialization # Searchbar initialization
@user_filter = $filter('userName') @user_filter = $filter('userName')
search_query = '' search_query = ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment