fix merge conflicts

hpc-io · Apr 12, 2024 · 337c7ea · 337c7ea
2 parents 6a1c0be + 68ebab8
commit 337c7ea
Show file tree

Hide file tree

Showing 26 changed files with 3,634 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+build/
+dist/
+*.egg-info/
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
 include requirements.txt
-include drishti/snippets/*
+include drishti/includes/snippets/*
diff --git a/drishti/snippets/__init__.py → drishti/handlers/__init__.py b/drishti/snippets/__init__.py → drishti/handlers/__init__.py