From 2acbade78955c0b930976ad30a9dbe2a65c387a8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 5 Apr 2018 17:50:13 +0630
Subject: [PATCH] remove conflict in secret

---
 config/secrets.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index eaac38a9..111e1843 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,13 +12,8 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-<<<<<<< HEAD
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: cloud
-=======
-  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
->>>>>>> fe01948dd322688f7d59acd0d002b569dbbd40e2
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L