fix bad conflict resolution
This commit is contained in:
1 parent
57759e89d1
commit
09dbcf3283
1 file changed
+1
@@ -511,4 +511,5 @@
|
||||
"profile": "Profile",
|
||||
"password": "Password",
|
||||
"team": "Team"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user