alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes en.yml conflicts

This commit is contained in:
Saurabh Bhatia 2014-05-01 15:55:10 +08:00
parent 03f5c0182e
commit 824b484e67
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/locales/en.yml
View File

@ -578,7 +578,6 @@ en:
update_: Update
update_at: Update at
update_manager: Update Manager
<<<<<<< Updated upstream
update_manager_:
available_updates: Available Updates
check_update: Check Update
@ -599,7 +598,6 @@ en:
time: Time
name: Account
page: Access Page and Action
=======
locale: Locale
login: Login
logout: Logout
@ -623,7 +621,6 @@ en:
authorization: Authorization
module_authorization: Module Authorization
>>>>>>> Stashed changes
users:
admin_change_password: You cannot change your own password here!
avatar: Profile Picture