dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solve conflict

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-24 02:21:13 +08:00
parent e5f2179791 e5137684f4
commit aec9da081a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -42,4 +42,4 @@ build/
*.DS_Store *.DS_Store
*.pl *.pl
*.bak *.bak
src/data/items.h src/data/items.h # Autogenerated by jsonproc