Fix merge conflict, turn of html name linting to allow BEM syntax

Author: nlhkabu

Makefile

@@ -115,7 +115,7 @@ saucelabs:
 lint: .state/env/pyvenv.cfg
 	$(BINDIR)/flake8 .
 	$(BINDIR)/doc8 --allow-long-titles README.rst CONTRIBUTING.rst docs/ --ignore-path docs/_build/
-	$(BINDIR)/html_lint.py --disable=optional_tag `find ./warehouse/templates -path ./warehouse/templates/legacy -prune -o -name '*.html' -print`
+	$(BINDIR)/html_lint.py --disable=optional_tag,names `find ./warehouse/templates -path ./warehouse/templates/legacy -prune -o -name '*.html' -print`
 	./node_modules/.bin/eslint 'warehouse/static/js/**'
 
 

warehouse/templates/base.html

@@ -53,13 +53,8 @@
 
             <form class="search-form search-form--primary" action="{{ request.route_path('search') }}">
               <label for="search" class="sr-only">Search PyPI</label>
-<<<<<<< 987b739e87af5d503f7b54b93ab50b82adf4388a
-              <input id="search" class="search" type="text" name="q" {{ l20n("search") }} placeholder="Search Projects" value="{{ term }}">
-              <input class="button button--dark" type="submit" {{ l20n("search") }} value="Search">
-=======
-              <input id="search" class="search-form__search" type="text" name="q" {{ l20n("search") }} placeholder="Search Packages" value="{{ term }}">
+              <input id="search" class="search-form__search" type="text" name="q" {{ l20n("search") }} placeholder="Search Projects" value="{{ term }}">
               <input class="search-form__button button button--dark" type="submit" {{ l20n("search") }} value="Search">
->>>>>>> Continue BEM refactor
             </form>
           </div>
           {% endblock %}