Merge pull request #81 from jake1164/fix_depends

Fix depends
jake1164 · Nov 30, 2024 · fca55cf · fca55cf
2 parents 4631403 + 6f283a7
commit fca55cf
Show file tree

Hide file tree

Showing 71 changed files with 496 additions and 232 deletions.
diff --git a/src/lib/adafruit_bitmap_font/bdf.mpy b/src/lib/adafruit_bitmap_font/bdf.mpy
diff --git a/src/lib/adafruit_bitmap_font/bdf.py b/src/lib/adafruit_bitmap_font/bdf.py
@@ -33,15 +33,7 @@
 from fontio import Glyph
 from .glyph_cache import GlyphCache
 
-<<<<<<< HEAD
-__version__ = "2.1.1"
-=======
-<<<<<<< HEAD
 __version__ = "2.1.3"
-=======
-__version__ = "2.1.1"
->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff
->>>>>>> origin/update_dependencies
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git"
 
 

diff --git a/src/lib/adafruit_bitmap_font/bitmap_font.mpy b/src/lib/adafruit_bitmap_font/bitmap_font.mpy
diff --git a/src/lib/adafruit_bitmap_font/bitmap_font.py b/src/lib/adafruit_bitmap_font/bitmap_font.py
@@ -31,15 +31,7 @@
 except ImportError:
     pass
 
-<<<<<<< HEAD
-__version__ = "2.1.1"
-=======
-<<<<<<< HEAD
 __version__ = "2.1.3"
-=======
-__version__ = "2.1.1"
->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff
->>>>>>> origin/update_dependencies
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git"
 
 

diff --git a/src/lib/adafruit_bitmap_font/glyph_cache.mpy b/src/lib/adafruit_bitmap_font/glyph_cache.mpy
diff --git a/src/lib/adafruit_bitmap_font/glyph_cache.py b/src/lib/adafruit_bitmap_font/glyph_cache.py
@@ -30,15 +30,7 @@
 
 import gc
 
-<<<<<<< HEAD
-__version__ = "2.1.1"
-=======
-<<<<<<< HEAD
 __version__ = "2.1.3"
-=======
-__version__ = "2.1.1"
->>>>>>> ae84eef1491903d49de0e32510d1ab243185d8ff
->>>>>>> origin/update_dependencies
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font.git"
 
 

diff --git a/src/lib/adafruit_bitmap_font/pcf.mpy b/src/lib/adafruit_bitmap_font/pcf.mpy