Administrivia

Author: rocky

.pre-commit-config.yaml

@@ -1,6 +1,5 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-<<<<<<< HEAD
     rev: v2.3.0
     hooks:
     - id: debug-statements
@@ -12,15 +11,3 @@ repos:
     - id: black
       language_version: python3
       exclude: 'pymathics/graph/version.py'
-=======
-    rev: v2.0.0
-    hooks:
-    - id: debug-statements
-    - id: end-of-file-fixer
--   repo: https://github.com/psf/black
-    rev: 20.8b1
-    hooks:
-    - id: black
-      language_version: python3
-      exclude: 'mathicsscript/version.py'
->>>>>>> 437146f76f607001a3682b411cffb7987d4f7d0d