FIX [bug]conflicts file for pull api

This commit is contained in:
jasder
2021-06-24 16:18:34 +08:00
parent b7dd12927b
commit 8d300e11f9
2 changed files with 12 additions and 11 deletions

View File

@@ -17,20 +17,19 @@ default: &default
username: root
password: 123456
# socket: /var/run/mysqld/mysqld.sock
gitea_server:
aadapter: mysql2
database: gitea_development
host: 127.0.0.1
username: root
password: "123456"
encoding: utf8
development:
<<: *default
host: 127.0.0.1
database: forge_development
gitea_db:
adapter: mysql2
database: gitea_development
host: 127.0.0.1
username: root
password: "123456"
encoding: utf8
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.