fixes merge conflict

2019-12-18 15:35:35 +08:00
parent ab4be051c8 5ec5650c6f
commit d276fa6900
1 changed files with 4 additions and 0 deletions
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "whoops broke quirks"