diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/activerecord.cy.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml index 248e93ad5..92fba043f 100644 --- a/config/locales/activerecord.cy.yml +++ b/config/locales/activerecord.cy.yml @@ -1,13 +1,10 @@ --- cy: activerecord: -<<<<<<< HEAD -======= attributes: poll: expires_at: Terfyn amser options: Dewisiadau ->>>>>>> f1597e1ab... Merge pull request #1158 from ThibG/glitch-soc/merge-upstream errors: models: account: |