chore(): fix merge conflict

ionic/util/test/util.spec.ts

@@ -232,6 +232,33 @@ export function run() {
 
     });
 
+    describe('getQuerystring', function() {
+      it('should have no entries for empty url', () => {
+        expect(util.getQuerystring('')).toEqual({});
+      });
+
+      it('should have no entries for url with no "?" character', () => {
+        expect(util.getQuerystring('http://localhost:1234/#key1=1&key2=2')).toEqual({});
+      });
+
+      it('should contain key/value entries for all the parameters after "?" character', () => {
+        expect(util.getQuerystring('http://localhost:1234/#key0=0&key0x=0x?key1=1&key2=2')).toEqual({
+          key1: '1',
+          key2: '2'
+        });
+      });
+
+      it('should ignore empty ?& and &&', () => {
+        expect(util.getQuerystring('http://localhost:1234/#?&&')).toEqual({});
+
+        expect(util.getQuerystring('http://localhost:1234/#?&&key1=1&key2=2&&')).toEqual({
+          key1: '1',
+          key2: '2'
+        });
+      });
+
+    });
+
     describe('isTrueProperty', function() {
 
       it('should be true from boolean true', () => {

ionic/util/util.ts

@@ -182,7 +182,7 @@ export function getQuerystring(url: string): any {
     const startIndex = url.indexOf('?');
     if (startIndex !== -1) {
       const queries = url.slice(startIndex + 1).split('&');
-      queries.forEach((param) => {
+      queries.filter((param) => { return param.indexOf('=') > 0; }).forEach((param) => {
         var split = param.split('=');
         queryParams[split[0].toLowerCase()] = split[1].split('#')[0];
       });