fix merge error

This commit is contained in:
Sumpfork 2016-03-16 15:48:23 -07:00
parent 7980a7857b
commit ea437a8d1a

View File

@ -2691,5 +2691,6 @@
"potcost": 0, "potcost": 0,
"types": [ "types": [
"Action" "Action"
]
} }
] ]