From 005be024f19dc0e95da8a339d5e1f5fec356dc64 Mon Sep 17 00:00:00 2001
From: cs0lar <cristiano.solarino@gmail.com>
Date: Sat, 15 Apr 2023 14:45:16 +0100
Subject: [PATCH] fixed typo

---
 .env.template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.env.template b/.env.template
index e6ef227f..f9d1ec10 100644
--- a/.env.template
+++ b/.env.template
@@ -57,7 +57,6 @@ SMART_TOKEN_LIMIT=8000
 ################################################################################
 
 # MEMORY_BACKEND - Memory backend type (Default: local)
->>>>>>> master
 MEMORY_BACKEND=local
 
 ### PINECONE