From 753ecef8532cf0ef5c0dc0565180ae661413731b Mon Sep 17 00:00:00 2001
From: SA <sa@Galaxy-S10.local>
Date: Sat, 12 Oct 2024 19:10:33 -0400
Subject: [PATCH 1/2] resolving merge issues

---
 sans_tools/NotesApp.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sans_tools/NotesApp.py b/sans_tools/NotesApp.py
index 33362d6..cc4f3c6 100644
--- a/sans_tools/NotesApp.py
+++ b/sans_tools/NotesApp.py
@@ -165,11 +165,7 @@ def insert_values(
                     ]
             )
         )
-<<<<<<< HEAD
     
-=======
-        print(values_list)
->>>>>>> main
         fmt_func = SansNotesApp.__format_values_string
         insert_value_query_string = SansNotesApp.INSERT.format(
             table_name_field=table_name,

From a858ba6847e18144405cbf4fdfad76b22e14468c Mon Sep 17 00:00:00 2001
From: developernation <simeon.f.anderson@gmail.com>
Date: Sat, 12 Oct 2024 19:22:30 -0400
Subject: [PATCH 2/2] created standard gitignore

---
 .gitignore | 143 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 134 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39b7f35..12c0a4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,134 @@
-/lk
-/dns_ips.py
-/nb
-/test_file.txt
-/SansNotesAppFiles/*
-/SansNotesAppFiles
-/NotesAppFeV2.py
-/*.csv
-/*.xlsx
\ No newline at end of file
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+docsrc/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+# However, in case you do not want to do that, uncomment the following line to ignore it.
+# Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyderworkspace
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
\ No newline at end of file