From 7cfd94053e97070a297c3f4040d91ae4b48f0f0a Mon Sep 17 00:00:00 2001
From: suti7yk5032 <yuman1965969@gmail.com>
Date: Tue, 4 Jun 2024 23:06:03 +0900
Subject: [PATCH] =?UTF-8?q?for=5Fpsql=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81?=
 =?UTF-8?q?=E3=82=92=E3=83=9E=E3=83=BC=E3=82=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitignore b/.gitignore
index 65e2f8a..76cbdaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,10 +160,5 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-<<<<<<< HEAD
-config/*
-db/*
-=======
 config/
 db/
->>>>>>> for_psql