From 114b2f1aae379d49ef48571e60634d72e352a8e3 Mon Sep 17 00:00:00 2001
From: Grisha Pomadchin <gr.pomadchin@gmail.com>
Date: Tue, 6 Aug 2013 10:38:27 +0400
Subject: [PATCH] after merge fixes

---
 intaro.intarocrm/classes/general/ICrmOrderActions.php | 4 ----
 intaro.intarocrm/install/index.php                    | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index b687a8fb..4ed06d3f 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -186,11 +186,7 @@ class ICrmOrderActions
         if(!$api || empty($arParams)) { // add cond to check $arParams
             return false;
         }
-<<<<<<< HEAD
 
-=======
-     
->>>>>>> cancelEvent
         if (empty($arFields)) {
             //handle err
             self::eventLog('ICrmOrderActions::orderCreate', 'empty($arFields)', 'incorrect order');
diff --git a/intaro.intarocrm/install/index.php b/intaro.intarocrm/install/index.php
index 85236673..ab4c9b24 100755
--- a/intaro.intarocrm/install/index.php
+++ b/intaro.intarocrm/install/index.php
@@ -419,7 +419,7 @@ class intaro_intarocrm extends CModule
     function DoUninstall() {
         global $APPLICATION;
 
-	CAgent::RemoveAgent("ICrmOrderActions::uploadOrdersAgent();", $this->MODULE_ID);
+        CAgent::RemoveAgent("ICrmOrderActions::uploadOrdersAgent();", $this->MODULE_ID);
 
         COption::RemoveOption($this->MODULE_ID, $this->CRM_API_HOST_OPTION);
         COption::RemoveOption($this->MODULE_ID, $this->CRM_API_KEY_OPTION);
@@ -453,4 +453,4 @@ class intaro_intarocrm extends CModule
         unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_run.php');
         unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_setup.php');
     }
-}
\ No newline at end of file
+}