From 259f0b15fc10470c00c57d88aec07617b5ee6ece Mon Sep 17 00:00:00 2001
From: Holly 'Frinkel' Lotor <admin@frinkel.tech>
Date: Mon, 20 Jan 2020 11:54:21 -0500
Subject: Merge first smoke test

---
 config/locales/activerecord.cy.yml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'config/locales/activerecord.cy.yml')

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:
-- 
cgit