删除遗留记号
This commit is contained in:
parent
4b1128120b
commit
4eea5c5431
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,4 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
# ignore debug
|
||||
out/
|
||||
build/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user