From 18d21f462b475cb4032abf71915bd0063e03d864 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 17 Oct 2020 16:36:03 +0000
Subject: [PATCH] [FIX] .gitmodules file

---
 .gitmodules | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 5309e9a7..562103ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,4 +19,3 @@
 [submodule "external/hibou-shipbox"]
 	path = external/hibou-shipbox
 	url = https://gitlab.com/hibou-io/hibou-odoo/shipbox.git
->>>>>>> .gitmodules