fix conflict

QuakeGod

2023-02-22 b6290b94cac76a5634cd90b495b65d91ee92d85e

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Thumbs.db 
*.TMP 
*.lst 
*.o 
*.d 
*.crf 
*.lnp 
*.axf 
*.htm 
*.build_log.htm 
*.dep 
*.iex 
*.iex 
*.bin 
 
MDK-ARM/F030C8T6_Test2/* 
*.uvguix.* 
*.uvgui.* 
*.uvoptx 
JLinkLog.txt