diff options
| author | Holly 'Frinkel' Lotor <admin@frinkel.tech> | 2020-01-20 11:54:21 -0500 |
|---|---|---|
| committer | Holly 'Frinkel' Lotor <admin@frinkel.tech> | 2020-01-20 16:56:53 -0500 |
| commit | 259f0b15fc10470c00c57d88aec07617b5ee6ece (patch) | |
| tree | 4a7bc0176181b760cab594a65c388713632cb95d /config | |
| parent | b0630ddc8261250c5edbf2907648695041649e98 (diff) | |
Merge first smoke test
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: |