Commit 9130cfb7 authored by Stan Hu's avatar Stan Hu

Resolve conflicts in app/assets/javascripts/pages/search/init_filtered_search.js

parent 03247eae
......@@ -30,7 +30,3 @@ export default function () {
howToMerge();
initWidget();
}
<<<<<<< HEAD
=======
>>>>>>> upstream/master
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