Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts: # .gitignoreback_recharge
commit
56a23659b3
|
|
@ -5,5 +5,4 @@
|
|||
*.xml
|
||||
*.bin
|
||||
*.lock
|
||||
|
||||
serverlogic/src/main/java/com/ljsd/jieling/protocols
|
||||
serverlogic/src/main/java/com/ljsd/jieling/protocols
|
||||
|
|
|
|||
Loading…
Reference in New Issue