<commit_before>{
  "name": "smarc",
  "version": "0.0.1",
  "description": "Smarc Home Automation Open Source System Using MEAN stack",
  "main": "core/server.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "repository": {
    "type": "git",
    "url": "git+https://github.com/xfoxawy/smarc.git"
  },
  "keywords": [
    "smart",
    "home",
    "automation"
  ],
  "author": "Smarc Systems",
  "license": "MIT",
  "bugs": {
    "url": "https://github.com/xfoxawy/smarc/issues"
  },
  "homepage": "https://github.com/xfoxawy/smarc#readme",
  "dependencies": {
    "async": "^1.5.0",
<<<<<<< HEAD:server/package.json
    "body-parser": "1.*",
    "express": "4.*",
    "socket.io": "1.*",
    "telnet-client": "0.*"
=======
    "bcryptjs": "^2.3.0",
    "body-parser": "1.*",
    "express": "4.*",
    "jsonwebtoken": "^5.7.0",
    "minimist": "1.2.*",
    "mongodb": "2.*",
    "nodemon": "^1.9.1",
    "redis": "^2.6.0-2",
    "socket.io": "1.*"
>>>>>>> server:server/package.json
  },
  "devDependencies": {
    "morgan": "1.*",
    "response-time": "2.*"
  }
}<commit_msg> fix package.json conflict<commit_after>{
  "name": "smarc",
  "version": "0.0.1",
  "description": "Smarc Home Automation Open Source System Using MEAN stack",
  "main": "core/server.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "repository": {
    "type": "git",
    "url": "git+https://github.com/xfoxawy/smarc.git"
  },
  "keywords": [
    "smart",
    "home",
    "automation"
  ],
  "author": "<NAME>",
  "license": "MIT",
  "bugs": {
    "url": "https://github.com/xfoxawy/smarc/issues"
  },
  "homepage": "https://github.com/xfoxawy/smarc#readme",
  "dependencies": {
    "async": "^1.5.0",
    "body-parser": "1.*",
    "express": "4.*",
    "socket.io": "1.*",
    "telnet-client": "0.*",
    "bcryptjs": "^2.3.0",
    "body-parser": "1.*",
    "express": "4.*",
    "jsonwebtoken": "^5.7.0",
    "minimist": "1.2.*",
    "mongodb": "2.*",
    "nodemon": "^1.9.1",
    "redis": "^2.6.0-2",
    "socket.io": "1.*"
  },
  "devDependencies": {
    "morgan": "1.*",
    "response-time": "2.*"
  }
}
{'fraction_non_alphanumeric': 0.27610208816705334, 'fraction_numerical': 0.029698375870069606, 'mean_word_length': 2.843137254901961, 'pattern_counts': {'":': 66, '<': 11, '<?xml version=': 0, '>': 11, 'https://': 6, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '70701', 'n_tokens_mistral': 924, 'n_tokens_neox': 893, 'n_words': 162}