From b736a9758ef83d6edc5becaa20ecd03b07ad703b Mon Sep 17 00:00:00 2001
From: Superag <superag@gmail.com>
Date: Mon, 5 Jun 2023 21:11:50 +0800
Subject: [PATCH] v1.4 update

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fe56e27..6d4ef30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,4 @@ configs/gpt_index.json
 configs/model_hash.json
 covers/*
 cache/*
-<<<<<<< HEAD
 assets
-=======
->>>>>>> 19d1823d451897734e81b21f925123e310001f50