From 14321e6ce639b36ad6b9865e33c5c36e474ce4f9 Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel@deflax.net>
Date: Fri, 4 Feb 2022 20:30:22 +0200
Subject: [PATCH] remove head

---
 flask/forest/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/flask/forest/__init__.py b/flask/forest/__init__.py
index d72505e..e313d83 100644
--- a/flask/forest/__init__.py
+++ b/flask/forest/__init__.py
@@ -31,10 +31,6 @@ sys.stderr.flush()
 
 app = Flask(__name__)
 app.config.from_object("forest.config.Config")
-<<<<<<< HEAD
-
-=======
->>>>>>> 830f996d6068222f74a4460d104568313b8d4434
 db = SQLAlchemy(app)
 #db = SQLAlchemy(session_options = { "autoflush": False })
 db.init_app(app)