That didn't happen.
This commit is contained in:
parent
a406775cd5
commit
cfd3876901
|
@ -8,10 +8,5 @@ needs_shared_font = false
|
||||||
|
|
||||||
[[ releases ]]
|
[[ releases ]]
|
||||||
title = "0004000000054000"
|
title = "0004000000054000"
|
||||||
<<<<<<< HEAD
|
|
||||||
region = "USA"
|
region = "USA"
|
||||||
release_date = ""
|
|
||||||
=======
|
|
||||||
region = "NTSC-U"
|
|
||||||
release_date = "2011-11-13"
|
release_date = "2011-11-13"
|
||||||
>>>>>>> Finished adding game descriptions and release dates.
|
|
||||||
|
|
Reference in New Issue