Resolve merge conflicts

sof-danny · Feb 24, 2024 · 864cac9 · 864cac9
2 parents fd7f6e9 + 4fd3f0c
commit 864cac9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/build/lib/Spannotation/cli.py b/build/lib/Spannotation/cli.py
@@ -23,3 +23,7 @@ def main():
 
 if __name__ == "__main__":
     main()
+
+
+
+
diff --git a/dist/spannotation-0.1.13-py3-none-any.whl b/dist/spannotation-0.1.13-py3-none-any.whl
diff --git a/dist/spannotation-0.1.13.tar.gz b/dist/spannotation-0.1.13.tar.gz
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='spannotation',
-    version='0.1.13',
+    version='0.1.14',
     author='Samuel O. Folorunsho',
     author_email='[email protected]',
     description="This Python package offers a simple yet powerful tool for image segmentation, particularly useful for navigation and path detection tasks in various environments. Utilizing minimal user input, it allows for the efficient segmentation of images into 'drivable' and 'non-drivable' regions, making it an ideal solution for a range of applications from agriculture to autonomous navigation.",

diff --git a/spannotation.egg-info/PKG-INFO b/spannotation.egg-info/PKG-INFO
@@ -54,7 +54,7 @@ or
 
 If you want to install a specific version:
 
-``` pip install spannotation==0.1.9 ```
+``` pip install spannotation==0.1.11 ```
 
 
 ## Usage on Python code Editor
@@ -74,7 +74,7 @@ or
 
 If you want to install a specific version:
 
-``` pip install spannotation==0.1.9 ```
+``` pip install spannotation==0.1.11 ```
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,3 +23,7 @@ def main():

		if __name__ == "__main__":
		main()