.gitignore

@@ -160,5 +160,10 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+<<<<<<< HEAD
+config/*
+db/*
+=======
 config/
 db/
+>>>>>>> for_psql

dislocker.py

@@ -1,8 +1,12 @@
 import json
 import discord
 import os
+<<<<<<< HEAD
+import sqlite3
+=======
 import psycopg2
 import datetime            
+>>>>>>> for_psql
 
 class Database():
     def __init__(self):
@@ -41,6 +45,10 @@ 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}")
@@ -73,6 +81,7 @@ 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():