| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619 | 
							- <<<<<<< HEAD
 
- {
 
-   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
 
-   "version": 1,
 
-   "newProjectRoot": "projects",
 
-   "projects": {
 
-     "app": {
 
-       "projectType": "application",
 
-       "schematics": {},
 
-       "root": "",
 
-       "sourceRoot": "src",
 
-       "prefix": "app",
 
-       "architect": {
 
-         "build": {
 
-           "builder": "@angular-devkit/build-angular:browser",
 
-           "options": {
 
-             "outputPath": "www",
 
-             "index": "src/index.html",
 
-             "main": "src/main.ts",
 
-             "polyfills": "src/polyfills.ts",
 
-             "tsConfig": "tsconfig.app.json",
 
-             "inlineStyleLanguage": "scss",
 
-             "assets": [
 
-               {
 
-                 "glob": "**/*",
 
-                 "input": "src/assets",
 
-                 "output": "assets"
 
-               },
 
-               {
 
-                 "glob": "**/*.svg",
 
-                 "input": "node_modules/ionicons/dist/ionicons/svg",
 
-                 "output": "./svg"
 
-               }
 
-             ],
 
-             "styles": ["src/global.scss", "src/theme/variables.scss"],
 
-             "scripts": []
 
-           },
 
-           "configurations": {
 
-             "production": {
 
-               "budgets": [
 
-                 {
 
-                   "type": "initial",
 
-                   "maximumWarning": "2mb",
 
-                   "maximumError": "5mb"
 
-                 },
 
-                 {
 
-                   "type": "anyComponentStyle",
 
-                   "maximumWarning": "2kb",
 
-                   "maximumError": "4kb"
 
-                 }
 
-               ],
 
-               "fileReplacements": [
 
-                 {
 
-                   "replace": "src/environments/environment.ts",
 
-                   "with": "src/environments/environment.prod.ts"
 
-                 }
 
-               ],
 
-               "outputHashing": "all"
 
-             },
 
-             "development": {
 
-               "buildOptimizer": false,
 
-               "optimization": false,
 
-               "vendorChunk": true,
 
-               "extractLicenses": false,
 
-               "sourceMap": true,
 
-               "namedChunks": true
 
-             },
 
-             "ci": {
 
-               "progress": false
 
-             }
 
-           },
 
-           "defaultConfiguration": "production"
 
-         },
 
-         "serve": {
 
-           "builder": "@angular-devkit/build-angular:dev-server",
 
-           "configurations": {
 
-             "production": {
 
-               "buildTarget": "app:build:production"
 
-             },
 
-             "development": {
 
-               "buildTarget": "app:build:development"
 
-             },
 
-             "ci": {
 
-               "progress": false
 
-             }
 
-           },
 
-           "defaultConfiguration": "development"
 
-         },
 
-         "extract-i18n": {
 
-           "builder": "@angular-devkit/build-angular:extract-i18n",
 
-           "options": {
 
-             "buildTarget": "app:build"
 
-           }
 
-         },
 
-         "test": {
 
-           "builder": "@angular-devkit/build-angular:karma",
 
-           "options": {
 
-             "main": "src/test.ts",
 
-             "polyfills": "src/polyfills.ts",
 
-             "tsConfig": "tsconfig.spec.json",
 
-             "karmaConfig": "karma.conf.js",
 
-             "inlineStyleLanguage": "scss",
 
-             "assets": [
 
-               {
 
-                 "glob": "**/*",
 
-                 "input": "src/assets",
 
-                 "output": "assets"
 
-               },
 
-               {
 
-                 "glob": "**/*.svg",
 
-                 "input": "node_modules/ionicons/dist/ionicons/svg",
 
-                 "output": "./svg"
 
-               }
 
-             ],
 
-             "styles": ["src/global.scss", "src/theme/variables.scss"],
 
-             "scripts": []
 
-           },
 
-           "configurations": {
 
-             "ci": {
 
-               "progress": false,
 
-               "watch": false
 
-             }
 
-           }
 
-         },
 
-         "lint": {
 
-           "builder": "@angular-eslint/builder:lint",
 
-           "options": {
 
-             "lintFilePatterns": [
 
-               "src/**/*.ts",
 
-               "src/**/*.html"
 
-             ]
 
-           }
 
-         }
 
-       }
 
-     }
 
-   },
 
-   "cli": {
 
-     "schematicCollections": [
 
-       "@ionic/angular-toolkit"
 
- <<<<<<< HEAD
 
-     ]
 
- =======
 
-     ],
 
-     "analytics": false
 
- >>>>>>> c476d2841db52fadbe2e1f19055c62ad9b8c8579
 
-   },
 
-   "schematics": {
 
-     "@ionic/angular-toolkit:component": {
 
-       "styleext": "scss"
 
-     },
 
-     "@ionic/angular-toolkit:page": {
 
-       "styleext": "scss"
 
-     }
 
-   }
 
- }
 
- =======
 
- {
 
-   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
 
-   "version": 1,
 
-   "newProjectRoot": "projects",
 
-   "projects": {
 
-     "app": {
 
-       "projectType": "application",
 
-       "schematics": {},
 
-       "root": "",
 
-       "sourceRoot": "src",
 
-       "prefix": "app",
 
-       "architect": {
 
-         "build": {
 
-           "builder": "@angular-devkit/build-angular:browser",
 
-           "options": {
 
-             "outputPath": "www",
 
-             "index": "src/index.html",
 
-             "main": "src/main.ts",
 
-             "polyfills": "src/polyfills.ts",
 
-             "tsConfig": "tsconfig.app.json",
 
-             "inlineStyleLanguage": "scss",
 
-             "assets": [
 
-               {
 
-                 "glob": "**/*",
 
-                 "input": "src/assets",
 
-                 "output": "assets"
 
-               },
 
-               {
 
-                 "glob": "**/*.svg",
 
-                 "input": "node_modules/ionicons/dist/ionicons/svg",
 
-                 "output": "./svg"
 
-               }
 
-             ],
 
-             "styles": ["src/global.scss", "src/theme/variables.scss"],
 
-             "scripts": []
 
-           },
 
-           "configurations": {
 
-             "production": {
 
-               "budgets": [
 
-                 {
 
-                   "type": "initial",
 
-                   "maximumWarning": "2mb",
 
-                   "maximumError": "5mb"
 
-                 },
 
-                 {
 
-                   "type": "anyComponentStyle",
 
-                   "maximumWarning": "2kb",
 
-                   "maximumError": "4kb"
 
-                 }
 
-               ],
 
-               "fileReplacements": [
 
-                 {
 
-                   "replace": "src/environments/environment.ts",
 
-                   "with": "src/environments/environment.prod.ts"
 
-                 }
 
-               ],
 
-               "outputHashing": "all"
 
-             },
 
-             "development": {
 
-               "buildOptimizer": false,
 
-               "optimization": false,
 
-               "vendorChunk": true,
 
-               "extractLicenses": false,
 
-               "sourceMap": true,
 
-               "namedChunks": true
 
-             },
 
-             "ci": {
 
-               "progress": false
 
-             }
 
-           },
 
-           "defaultConfiguration": "production"
 
-         },
 
-         "serve": {
 
-           "builder": "@angular-devkit/build-angular:dev-server",
 
-           "configurations": {
 
-             "production": {
 
-               "buildTarget": "app:build:production"
 
-             },
 
-             "development": {
 
-               "buildTarget": "app:build:development"
 
-             },
 
-             "ci": {
 
-               "progress": false
 
-             }
 
-           },
 
-           "defaultConfiguration": "development"
 
-         },
 
-         "extract-i18n": {
 
-           "builder": "@angular-devkit/build-angular:extract-i18n",
 
-           "options": {
 
-             "buildTarget": "app:build"
 
-           }
 
-         },
 
-         "test": {
 
-           "builder": "@angular-devkit/build-angular:karma",
 
-           "options": {
 
-             "main": "src/test.ts",
 
-             "polyfills": "src/polyfills.ts",
 
-             "tsConfig": "tsconfig.spec.json",
 
-             "karmaConfig": "karma.conf.js",
 
-             "inlineStyleLanguage": "scss",
 
-             "assets": [
 
-               {
 
-                 "glob": "**/*",
 
-                 "input": "src/assets",
 
-                 "output": "assets"
 
-               },
 
-               {
 
-                 "glob": "**/*.svg",
 
-                 "input": "node_modules/ionicons/dist/ionicons/svg",
 
-                 "output": "./svg"
 
-               }
 
-             ],
 
-             "styles": ["src/global.scss", "src/theme/variables.scss"],
 
-             "scripts": []
 
-           },
 
-           "configurations": {
 
-             "ci": {
 
-               "progress": false,
 
-               "watch": false
 
-             }
 
-           }
 
-         },
 
-         "lint": {
 
-           "builder": "@angular-eslint/builder:lint",
 
-           "options": {
 
-             "lintFilePatterns": [
 
-               "src/**/*.ts",
 
-               "src/**/*.html"
 
-             ]
 
-           }
 
-         }
 
-       }
 
-     }
 
-   },
 
-   "cli": {
 
-     "schematicCollections": [
 
-       "@ionic/angular-toolkit"
 
-     ]
 
-   
 
-     ,"analytics": false
 
-   },
 
-   "schematics": {
 
-     "@ionic/angular-toolkit:component": {
 
-       "styleext": "scss"
 
-     },
 
-     "@ionic/angular-toolkit:page": {
 
-       "styleext": "scss"
 
-     }
 
-   }
 
- }
 
- {
 
-   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
 
-   "version": 1,
 
-   "newProjectRoot": "projects",
 
-   "projects": {
 
-     "app": {
 
-       "projectType": "application",
 
-       "schematics": {},
 
-       "root": "",
 
-       "sourceRoot": "src",
 
-       "prefix": "app",
 
-       "architect": {
 
-         "build": {
 
-           "builder": "@angular-devkit/build-angular:browser",
 
-           "options": {
 
-             "outputPath": "www",
 
-             "index": "src/index.html",
 
-             "main": "src/main.ts",
 
-             "polyfills": "src/polyfills.ts",
 
-             "tsConfig": "tsconfig.app.json",
 
-             "inlineStyleLanguage": "scss",
 
-             "assets": [
 
-               {
 
-                 "glob": "**/*",
 
-                 "input": "src/assets",
 
-                 "output": "assets"
 
-               },
 
-               {
 
-                 "glob": "**/*.svg",
 
-                 "input": "node_modules/ionicons/dist/ionicons/svg",
 
-                 "output": "./svg"
 
-               }
 
-             ],
 
-             "styles": ["src/global.scss", "src/theme/variables.scss"],
 
-             "scripts": []
 
-           },
 
-           "configurations": {
 
-             "production": {
 
-               "budgets": [
 
-                 {
 
-                   "type": "initial",
 
-                   "maximumWarning": "2mb",
 
-                   "maximumError": "5mb"
 
-                 },
 
-                 {
 
-                   "type": "anyComponentStyle",
 
-                   "maximumWarning": "2kb",
 
-                   "maximumError": "4kb"
 
-                 }
 
-               ],
 
-               "fileReplacements": [
 
-                 {
 
-                   "replace": "src/environments/environment.ts",
 
-                   "with": "src/environments/environment.prod.ts"
 
-                 }
 
-               ],
 
-               "outputHashing": "all"
 
-             },
 
-             "development": {
 
-               "buildOptimizer": false,
 
-               "optimization": false,
 
-               "vendorChunk": true,
 
-               "extractLicenses": false,
 
-               "sourceMap": true,
 
-               "namedChunks": true
 
-             },
 
-             "ci": {
 
-               "progress": false
 
-             }
 
-           },
 
-           "defaultConfiguration": "production"
 
-         },
 
-         "serve": {
 
-           "builder": "@angular-devkit/build-angular:dev-server",
 
-           "configurations": {
 
-             "production": {
 
-               "buildTarget": "app:build:production"
 
-             },
 
-             "development": {
 
-               "buildTarget": "app:build:development"
 
-             },
 
-             "ci": {
 
-               "progress": false
 
-             }
 
-           },
 
-           "defaultConfiguration": "development"
 
-         },
 
-         "extract-i18n": {
 
-           "builder": "@angular-devkit/build-angular:extract-i18n",
 
-           "options": {
 
-             "buildTarget": "app:build"
 
-           }
 
-         },
 
-         "test": {
 
-           "builder": "@angular-devkit/build-angular:karma",
 
-           "options": {
 
-             "main": "src/test.ts",
 
-             "polyfills": "src/polyfills.ts",
 
-             "tsConfig": "tsconfig.spec.json",
 
-             "karmaConfig": "karma.conf.js",
 
-             "inlineStyleLanguage": "scss",
 
-             "assets": [
 
-               {
 
-                 "glob": "**/*",
 
-                 "input": "src/assets",
 
-                 "output": "assets"
 
-               },
 
-               {
 
-                 "glob": "**/*.svg",
 
-                 "input": "node_modules/ionicons/dist/ionicons/svg",
 
-                 "output": "./svg"
 
-               }
 
-             ],
 
-             "styles": ["src/global.scss", "src/theme/variables.scss"],
 
-             "scripts": []
 
-           },
 
-           "configurations": {
 
-             "ci": {
 
-               "progress": false,
 
-               "watch": false
 
-             }
 
-           }
 
-         },
 
-         "lint": {
 
-           "builder": "@angular-eslint/builder:lint",
 
-           "options": {
 
-             "lintFilePatterns": [
 
-               "src/**/*.ts",
 
-               "src/**/*.html"
 
-             ]
 
-           }
 
-         }
 
-       }
 
-     }
 
-   },
 
-   "cli": {
 
-     "schematicCollections": [
 
-       "@ionic/angular-toolkit"
 
- <<<<<<< HEAD
 
-     ]
 
- =======
 
-     ],
 
-     "analytics": false
 
- >>>>>>> c476d2841db52fadbe2e1f19055c62ad9b8c8579
 
-   },
 
-   "schematics": {
 
-     "@ionic/angular-toolkit:component": {
 
-       "styleext": "scss"
 
-     },
 
-     "@ionic/angular-toolkit:page": {
 
-       "styleext": "scss"
 
-     }
 
-   }
 
- }
 
- =======
 
- {
 
-   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
 
-   "version": 1,
 
-   "newProjectRoot": "projects",
 
-   "projects": {
 
-     "app": {
 
-       "projectType": "application",
 
-       "schematics": {},
 
-       "root": "",
 
-       "sourceRoot": "src",
 
-       "prefix": "app",
 
-       "architect": {
 
-         "build": {
 
-           "builder": "@angular-devkit/build-angular:browser",
 
-           "options": {
 
-             "outputPath": "www",
 
-             "index": "src/index.html",
 
-             "main": "src/main.ts",
 
-             "polyfills": "src/polyfills.ts",
 
-             "tsConfig": "tsconfig.app.json",
 
-             "inlineStyleLanguage": "scss",
 
-             "assets": [
 
-               {
 
-                 "glob": "**/*",
 
-                 "input": "src/assets",
 
-                 "output": "assets"
 
-               },
 
-               {
 
-                 "glob": "**/*.svg",
 
-                 "input": "node_modules/ionicons/dist/ionicons/svg",
 
-                 "output": "./svg"
 
-               }
 
-             ],
 
-             "styles": ["src/global.scss", "src/theme/variables.scss"],
 
-             "scripts": []
 
-           },
 
-           "configurations": {
 
-             "production": {
 
-               "budgets": [
 
-                 {
 
-                   "type": "initial",
 
-                   "maximumWarning": "2mb",
 
-                   "maximumError": "5mb"
 
-                 },
 
-                 {
 
-                   "type": "anyComponentStyle",
 
-                   "maximumWarning": "2kb",
 
-                   "maximumError": "4kb"
 
-                 }
 
-               ],
 
-               "fileReplacements": [
 
-                 {
 
-                   "replace": "src/environments/environment.ts",
 
-                   "with": "src/environments/environment.prod.ts"
 
-                 }
 
-               ],
 
-               "outputHashing": "all"
 
-             },
 
-             "development": {
 
-               "buildOptimizer": false,
 
-               "optimization": false,
 
-               "vendorChunk": true,
 
-               "extractLicenses": false,
 
-               "sourceMap": true,
 
-               "namedChunks": true
 
-             },
 
-             "ci": {
 
-               "progress": false
 
-             }
 
-           },
 
-           "defaultConfiguration": "production"
 
-         },
 
-         "serve": {
 
-           "builder": "@angular-devkit/build-angular:dev-server",
 
-           "configurations": {
 
-             "production": {
 
-               "buildTarget": "app:build:production"
 
-             },
 
-             "development": {
 
-               "buildTarget": "app:build:development"
 
-             },
 
-             "ci": {
 
-               "progress": false
 
-             }
 
-           },
 
-           "defaultConfiguration": "development"
 
-         },
 
-         "extract-i18n": {
 
-           "builder": "@angular-devkit/build-angular:extract-i18n",
 
-           "options": {
 
-             "buildTarget": "app:build"
 
-           }
 
-         },
 
-         "test": {
 
-           "builder": "@angular-devkit/build-angular:karma",
 
-           "options": {
 
-             "main": "src/test.ts",
 
-             "polyfills": "src/polyfills.ts",
 
-             "tsConfig": "tsconfig.spec.json",
 
-             "karmaConfig": "karma.conf.js",
 
-             "inlineStyleLanguage": "scss",
 
-             "assets": [
 
-               {
 
-                 "glob": "**/*",
 
-                 "input": "src/assets",
 
-                 "output": "assets"
 
-               },
 
-               {
 
-                 "glob": "**/*.svg",
 
-                 "input": "node_modules/ionicons/dist/ionicons/svg",
 
-                 "output": "./svg"
 
-               }
 
-             ],
 
-             "styles": ["src/global.scss", "src/theme/variables.scss"],
 
-             "scripts": []
 
-           },
 
-           "configurations": {
 
-             "ci": {
 
-               "progress": false,
 
-               "watch": false
 
-             }
 
-           }
 
-         },
 
-         "lint": {
 
-           "builder": "@angular-eslint/builder:lint",
 
-           "options": {
 
-             "lintFilePatterns": [
 
-               "src/**/*.ts",
 
-               "src/**/*.html"
 
-             ]
 
-           }
 
-         }
 
-       }
 
-     }
 
-   },
 
-   "cli": {
 
-     "schematicCollections": [
 
-       "@ionic/angular-toolkit"
 
-     ],
 
-     "analytics": false
 
-   },
 
-   "schematics": {
 
-     "@ionic/angular-toolkit:component": {
 
-       "styleext": "scss"
 
-     },
 
-     "@ionic/angular-toolkit:page": {
 
-       "styleext": "scss"
 
-     }
 
-   }
 
- }
 
- >>>>>>> 7d36083 (oo)
 
- >>>>>>> d249228 (oo)
 
- >>>>>>> 4ee10a2 (oo)
 
 
  |