author

pysal · Jan 16, 2025 · 97a4cee · 97a4cee
1 parent 859b191
commit 97a4cee
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/inequality/theil.py b/inequality/theil.py
@@ -1,6 +1,9 @@
 """Theil Inequality metrics"""
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 5ae825e (author)
 __author__ = "Sergio J. Rey <[email protected]>"
 
 import numpy