chore(merge): fix merge conflicts

Author: danbucholtz

bin/ion-dev.js

@@ -391,7 +391,9 @@ window.IonicDevServer = {
       }
     });
 
-    this.enableShake();
+    if (location.href.indexOf('devapp=true') < 0) {
+      this.enableShake();
+    }
   },
 
   enableShake: function() {

src/util/config.ts

@@ -197,7 +197,7 @@ export function generateContext(context?: BuildContext): BuildContext {
   setProcessEnvVar(Constants.ENV_COMPONENTS_NG_MODULE_PATH, context.componentsNgModulePath);
   Logger.debug(`componentsNgModulePath set to ${context.componentsNgModulePath}`);
 
-  context.pipesNgModulePath = resolve(getConfigValue(context, '--pipesNgModulePath', null, Constants.ENV_PIPES_NG_MODULE_PATH, Constants.ENV_PIPES_NG_MODULE_PATH.toLowerCase(), join(context.srcDir, 'PIPES', 'pipes.module.ts')));
+  context.pipesNgModulePath = resolve(getConfigValue(context, '--pipesNgModulePath', null, Constants.ENV_PIPES_NG_MODULE_PATH, Constants.ENV_PIPES_NG_MODULE_PATH.toLowerCase(), join(context.srcDir, 'pipes', 'pipes.module.ts')));
   setProcessEnvVar(Constants.ENV_PIPES_NG_MODULE_PATH, context.pipesNgModulePath);
   Logger.debug(`pipesNgModulePath set to ${context.pipesNgModulePath}`);