Fixes conflict after pull
This commit is contained in:
commit
56b595980e
3 files changed
+3
-2
No files matched your search
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"options": "Erik Options",
|
||||
"options": "Options",
|
||||
"about": "About"
|
||||
}
|
||||
Reference in new issue
Block a user