From 1a580d73329a87f72ee89137d33563335239f7c7 Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Mon, 7 Mar 2016 15:23:19 +0200
Subject: [PATCH] translations merge fix

---
 config/locales/en.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 63959319e..e18601026 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -939,7 +939,3 @@ en:
   add_blocked_domain: 'Add domain to blocked list'
   edit_pw: 'Edit Pw'
   optional: 'Optional'
-=======
-  personal_domain_verification_url: 'Personal domain verification url'
-  available_verification_url_not_found: 'Available verification url not found, for domain.'
->>>>>>> Temporary merge branch 2