Resolve merge conflict.

8708b746 · Stefan Behnel · f24dca2e · 8708b746
Commit 8708b746 authored Oct 08, 2020 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Cython/Compiler/PyrexTypes.py Cython/Compiler/PyrexTypes.py +0 -4

No files found.
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -4,10 +4,6 @@

 from __future__ import absolute_import

-<<<<<<< HEAD
-import hashlib
-=======
->>>>>>> 0.29.x
 import copy
 import hashlib
 import re