Failed merge

Author: bittermandel

tests/test_filter.py

@@ -73,14 +73,8 @@ def test_crispy_filter(self):
             <option value="not_accepted">Not accepted</option>
             </select><div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
             <svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-<<<<<<< HEAD
-            <path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"></path> 
-            </svg> 
-            </div> </div></div>
-=======
             <path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"></path>
             </svg>
             </div> </div></div></div>
->>>>>>> master
             """,
         )