修复了冲突

This commit is contained in:
Jered Ye 2024-01-13 21:36:26 +08:00
parent 919ecbd649
commit 6157c002b9
1 changed files with 14 additions and 0 deletions

14
.gitignore vendored Normal file
View File

@ -0,0 +1,14 @@
client/build/built-jar.properties
client/nbproject/build-impl.xml
client/nbproject/genfiles.properties
client/nbproject/private/private.properties
client/nbproject/project.properties
client/problem.html
client/test/output/Main.cpp
clientUpdater/dist/clientUpdater.jar
clientUpdater/dist/lib/Common.jar
clientUpdater/dist/README.TXT
Common/dist/Common.jar
Judger/dist/Judger.jar
Judger/dist/lib/Common.jar