package.json.orig

{
<<<<<<< HEAD
    "name": "placementApp",
    "version": "0.0.1",
    "description": "An Ionic project",
    "dependencies": {
        "cordova-android": "^6.2.2",
        "cordova-plugin-device": "^1.1.4",
        "cordova-plugin-splashscreen": "^4.0.3",
        "cordova-plugin-statusbar": "^2.2.1",
        "cordova-plugin-whitelist": "^1.3.1",
        "gulp": "^3.5.6",
        "gulp-concat": "^2.2.0",
        "gulp-minify-css": "^0.3.0",
        "gulp-rename": "^1.2.0",
        "gulp-sass": "^2.0.4",
        "ionic-plugin-keyboard": "^2.2.1"
    },
    "devDependencies": {
        "@ionic/cli-plugin-cordova": "1.4.0",
        "@ionic/cli-plugin-gulp": "1.0.1",
        "@ionic/cli-plugin-ionic1": "2.0.0",
        "bower": "^1.3.3",
        "gulp-util": "^2.2.14",
        "shelljs": "^0.3.0"
    },
    "cordova": {
        "plugins": {
            "cordova-plugin-device": {},
            "cordova-plugin-splashscreen": {},
            "cordova-plugin-statusbar": {},
            "cordova-plugin-whitelist": {},
            "ionic-plugin-keyboard": {}
        },
        "platforms": [
            "android"
        ]
    }
}
=======
  "private": true,
  "scripts": {
    "bootstrap": "lerna bootstrap && npm run build",
    "clean": "lerna run clean",
    "lint": "lerna run lint",
    "test": "lerna run test",
    "build": "lerna run build",
    "watch": "lerna run watch --parallel",
    "docs": "node ./packages/@ionic/cli-scripts/docs.js",
    "publish:canary": "lerna publish --canary --exact --npm-tag=canary --skip-git",
    "publish:testing": "lerna publish --canary=testing --exact --npm-tag=testing --skip-git",
    "publish": "lerna publish --exact --conventional-commits",
    "prepush": "npm run lint"
  },
  "devDependencies": {
    "@types/node": "^6.0.85",
    "concurrently": "^3.4.0",
    "coveralls": "^2.2.0",
    "eslint-config-ionic": "0.0.2",
    "husky": "^0.14.3",
    "jest": "^20.0.4",
    "jest-cli": "^20.0.4",
    "lerna": "^2.0.0",
    "replace": "^0.3.0",
    "ts-jest": "^20.0.10",
    "tslint": "^5.6.0",
    "tslint-ionic-rules": "^0.0.11",
    "typescript": "^2.5.0-dev.20170807"
  }
}
>>>>>>> 3a447a5e88ef85cb690251cfe521a0c51a657d19