From 3244131e14b70732c3920debdac0354b5d77369b Mon Sep 17 00:00:00 2001
From: nixa <4dmitr@gmail.com>
Date: Tue, 12 Jul 2016 11:02:30 +0300
Subject: [PATCH] fix(merge): fix merge issues

---
 config/webpack.common.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/webpack.common.js b/config/webpack.common.js
index 34c2d39a..25772a7d 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -87,7 +87,8 @@ module.exports = {
         loader: 'source-map-loader',
         exclude: [
           // these packages have problems with their sourcemaps
-          helpers.root('node_modules/rxjs')
+          helpers.root('node_modules/rxjs'),
+          helpers.root('node_modules/ng2-bootstrap'),
         ]
       }