From b08e12560f97def3c589c8235de88dc99a136ee0 Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Tue, 30 Apr 2013 17:10:21 +0000
Subject: [PATCH] merge earlier

---
 run.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/run.js b/run.js
index b63613f..2af040c 100644
--- a/run.js
+++ b/run.js
@@ -295,19 +295,7 @@ DBot.prototype.reloadModules = function() {
             }
 
             this.modules[module.name] = module;
-<<<<<<< HEAD
         }.bind(this));
-=======
-        } catch(err) {
-            console.log(this.t('module_load_error', { 'moduleName': name }));
-            this.status[name] = err + ' - ' + err.stack.split('\n')[1].trim();
-            if(this.config.debugMode) {
-                console.log('MODULE ERROR (' + name + '): ' + err.stack );
-            } else {
-                console.log('MODULE ERROR (' + name + '): ' + err );
-            }
-        }
->>>>>>> 2afb1c6ba37eb92f875124c754453bb063f42277
     }.bind(this));
 
     process.nextTick(function() {