From 9de1222c187be4db8906d4c8c580eae701409cdc Mon Sep 17 00:00:00 2001
From: "Antonino Sabetta (i064196)" <antonino.sabetta@sap.com>
Date: Wed, 14 Oct 2020 15:41:27 +0200
Subject: [PATCH] chore: update gitignore

---
 .gitignore     | 2 ++
 kaybee/VERSION | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 20131a29..95ce8db4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 site
+**/merge.log
+.kaybee
 */cpu.prof
 kaybee/internal/repository/profile001.pdf
 kaybee/internal/repository/repository.test
diff --git a/kaybee/VERSION b/kaybee/VERSION
index 7e19ae6a..592e815e 100644
--- a/kaybee/VERSION
+++ b/kaybee/VERSION
@@ -1 +1 @@
-0.6.12-dev
+0.6.12