Fixes conflict after pull

This commit is contained in:
João Felipe Medeiros Moreira committed 2019-06-06 15:12:30 -03:00
commit 56b595980e
3 files changed
+3 -2

No files matched your search

@@ -1,4 +1,4 @@
{
"options": "Erik Options",
"options": "Options",
"about": "About"
}