From dcceec1766f27accb4fb403ecaae8084c71120c0 Mon Sep 17 00:00:00 2001
From: Alex Lushpai <alex@lushpai.org>
Date: Wed, 20 Aug 2014 00:21:14 +0400
Subject: [PATCH] fix install doc

---
 doc/Install.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/Install.md b/doc/Install.md
index f05722a..830570f 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -70,6 +70,5 @@ protected function crmOrderAction($order, $order_id, $action=null)
 Setup cron job for exchange between CRM & your shop
 
 ```
-<<<<<<< HEAD
 */5 * * * * /usr/bin/php /path/to/opencart/cli/cli_export.php >> /path/to/opencart/system/logs/cronjob_history.log 2>&1
 ```