From ace0af03d63bee710745f618d5bb9eabaab53802 Mon Sep 17 00:00:00 2001
From: suti7yk5032 <yuman1965969@gmail.com>
Date: Tue, 4 Jun 2024 23:06:11 +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

---
 dislocker.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/dislocker.py b/dislocker.py
index 2052636..1e363d7 100644
--- a/dislocker.py
+++ b/dislocker.py
@@ -1,12 +1,8 @@
 import json
 import discord
 import os
-<<<<<<< HEAD
-import sqlite3
-=======
 import psycopg2
 import datetime            
->>>>>>> for_psql
 
 class Database():
     def __init__(self):
@@ -45,10 +41,6 @@ class Database():
         elif result[0][1] == username and result[0][2] == password:
             return 0
 
-<<<<<<< HEAD
-
-cert = Cert()
-=======
 class Bot(discord.Client):
     def db_connect(self, host, db, user, password):
         self.db = psycopg2.connect(f"host={host} dbname={db} user={user} password={password}")
@@ -81,7 +73,6 @@ class Bot(discord.Client):
                             await message.channel.send("パソコンの台数が\n# だめです")
                     else:
                         await message.channel.send("構文が不正です。")
->>>>>>> for_psql
 
                 elif len(msg_split) >= 4:
                     if msg_split[1].isdigit() and msg_split[2].isdigit():