删除了会影响发布的东西

Author: OpenHill

DjangoOneBlog/DjangoOneBlog/settings.py

@@ -77,12 +77,6 @@
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
-<<<<<<< HEAD
-=======
-# import pymysql
-# pymysql.install_as_MySQLdb()
->>>>>>> master
-
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.mysql",