)]}'
{
  "commit": "7b6b089faf6cafa27f42c53a4fd323f616d75039",
  "tree": "0dede8d4a10546f1248c4ad363093e803a8b8faa",
  "parents": [
    "e065716e977515006309b9a9aa02f281f369566f"
  ],
  "author": {
    "name": "Sergey Kamov",
    "email": "skhdlemail@gmail.com",
    "time": "Sat Aug 07 09:06:01 2021 +0300"
  },
  "committer": {
    "name": "Sergey Kamov",
    "email": "skhdlemail@gmail.com",
    "time": "Sat Aug 07 09:06:01 2021 +0300"
  },
  "message": "# Conflicts:\n#\tpom.xml\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "65670037cdc6504d12bd0d4e42dbf166dc39e1ec",
      "old_mode": 33188,
      "old_path": "pom.xml",
      "new_id": "fec112eb4cdc12e4605ae474194a3548b5ee7b41",
      "new_mode": 33188,
      "new_path": "pom.xml"
    },
    {
      "type": "modify",
      "old_id": "85d8552667c0a2f95a979641fff986acae042b43",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/NCClient.java",
      "new_id": "ad5c59d532493d8a286cc55dd9db134f00be65b3",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCClient.java"
    },
    {
      "type": "modify",
      "old_id": "c0a238bfc7f0e8cca7f65be0119168f1e7e57b9d",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/NCClientBuilder.java",
      "new_id": "a07f559405f2103d578de5da2b278c466b153ef2",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCClientBuilder.java"
    },
    {
      "type": "modify",
      "old_id": "93baac5e58e4bf8d87bbce9a054be692748c2819",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/NCCompany.java",
      "new_id": "68be2d09dfde7575c7d07f9add2b29fc7f563f27",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCCompany.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "d06c0861cddf054cc9ec47f5eb98847a5819ba7a",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCElement.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "5af535736f8810c1c77f9a5ade2317923af1b3b5",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCElementSynonymsData.java"
    },
    {
      "type": "modify",
      "old_id": "4712df8bdf74f1d5ffb97cc8f4a6b8488033163a",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/NCModel.java",
      "new_id": "4e9c4ae0528cbdf3f9277b55e12d2edcfa94d2d7",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCModel.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "4b8671121745864fab4951fbe57d3721fd47373d",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCModelInfo.java"
    },
    {
      "type": "modify",
      "old_id": "802e890d96d2282c97852124d6b5939fe64950c0",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/NCResult.java",
      "new_id": "74d98719990b40c9861a982f2f3254722dbf92e9",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCResult.java"
    },
    {
      "type": "modify",
      "old_id": "cb90f1c6c80a207e84a7b7fce92237eb765e52a3",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/NCSuggestion.java",
      "new_id": "dd5336168cd7567cc26f364e32ac1029d9b6b7fe",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCSuggestion.java"
    },
    {
      "type": "modify",
      "old_id": "967b7f0445412de2dd632ba9025a8c4e4abab91b",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/NCSuggestionData.java",
      "new_id": "56c7e3cfd5557dcda9d76ed6fcfa475821048127",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCSuggestionData.java"
    },
    {
      "type": "modify",
      "old_id": "14989b1e4c6c40c052a187cb6e795908ef69f1da",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/NCUser.java",
      "new_id": "fb6242e3a0ef6543d6e78707d0f9ff8aaa0a8b70",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCUser.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "0b96595d9d9a452a3c5abb094930ae064a46d2b8",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/NCValue.java"
    },
    {
      "type": "modify",
      "old_id": "1d7055b1a7c4356e1675712076f28c5240227204",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/NCClientImpl.java",
      "new_id": "9327c19b80303aa599cffec02ad857469d7261ab",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/NCClientImpl.java"
    },
    {
      "type": "modify",
      "old_id": "b72cfd33b992396baf4a602f3588cf40d0204a87",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java",
      "new_id": "c5b67506fd33e72ca0560f79e62f606ccd8396f0",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java"
    },
    {
      "type": "modify",
      "old_id": "aac9c3331b6a4c1eaf90c034a175fe2f7b927496",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java",
      "new_id": "0a461ea1a93af455ed5daa3cddc4fc5673e230dd",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java"
    },
    {
      "type": "modify",
      "old_id": "93a3a999c221380fc923bb780f9e6bb93e14c695",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java",
      "new_id": "2df35ba09fd61e3f7244e3434483ea92d3190d83",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java"
    },
    {
      "type": "modify",
      "old_id": "9d3157eaa432a5d633a9720b94a13b6909e5fa06",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java",
      "new_id": "a781bc315c6afe75c82efe5e54cdc768e808f0e6",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java"
    },
    {
      "type": "modify",
      "old_id": "5fed10d587337908890d39174d3dae5a6b1d1c12",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java",
      "new_id": "73bbdb46f033e5f4fad9a290e4cfc121bedfbe57",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "109b71c05f52eeaaa045a4e6f663d90fd635e6a9",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCElementBean.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "c321acb626f68794c567519c69346a7f35c25640",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCElementSynonymsDataBean.java"
    },
    {
      "type": "modify",
      "old_id": "73c0d79c15173c092d495c22003582dd80f463dd",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java",
      "new_id": "d01ea9466a3586e129a5693b7b155e223743ca03",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java"
    },
    {
      "type": "modify",
      "old_id": "d94d03b90c57ba59eabc816d1b80eaf1fa376d1e",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java",
      "new_id": "a4fc1c7f9f8de0b53e424da123b5fde7876eb617",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java"
    },
    {
      "type": "modify",
      "old_id": "91f753aa1d1464c10ec18cd44e0640125e43e485",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java",
      "new_id": "f2be78178d659101f31bf4d2becdfd8314de2503",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java"
    },
    {
      "type": "modify",
      "old_id": "119ab65daf1ad8f6184f4aa58fa25e8f59710e2c",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java",
      "new_id": "aef0172fd0f67625e1d030ea37ad7ca901871484",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java"
    },
    {
      "type": "modify",
      "old_id": "1fcf9757a5148eae7e7b7810793b575c7a3cda16",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java",
      "new_id": "c2c74c56532cf8e8a65986d16123d65153189f4f",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "579710736103c976dc05e452f1f8028c282048cc",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelInfoBean.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "0750e9dd0d6c2f47e8dc0cead5ad60212fef8507",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelInfoResultBean.java"
    },
    {
      "type": "modify",
      "old_id": "86f9dda6cb46e1cbef7864e4a7868d13589f037a",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java",
      "new_id": "88a191dd089c0c4fc79cfb8c3bef94b96edf0939",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java"
    },
    {
      "type": "modify",
      "old_id": "e9a9f64870335433ef1309cb5319f74878254075",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java",
      "new_id": "622577b89397168739f0f5bfaf68dc7e176782d0",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java"
    },
    {
      "type": "modify",
      "old_id": "f50f9cf4083d265aaee9d234782168e8af6e80b9",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java",
      "new_id": "1adfec6b4adfc69ee787a5400e7e60f2e2d05c02",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java"
    },
    {
      "type": "modify",
      "old_id": "1051b85af19632f9b575269c405b7246e43fb9b2",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java",
      "new_id": "1779deb7d9763a9c45d88dbcbf5e3cf75ad27434",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java"
    },
    {
      "type": "modify",
      "old_id": "c3ac26393f8a473e9329531e88ebbe94c734e5ae",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java",
      "new_id": "f6c44d11f656cc9db506ac032801eecfbf649de0",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java"
    },
    {
      "type": "modify",
      "old_id": "943bfde840195ed02e5c79304ae97bd1b5af138e",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionBean.java",
      "new_id": "2130517f736849db16de95a65a28668cf6e31b2b",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionBean.java"
    },
    {
      "type": "modify",
      "old_id": "7804d1a4a416c07a57ba568efc9358ea6c0f33bb",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionDataBean.java",
      "new_id": "6321dccba017083513532a30b4e34149fcbca0be",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionDataBean.java"
    },
    {
      "type": "modify",
      "old_id": "304bb3967ef474041cd36ed9ccf726dad99bd8cb",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionResultBean.java",
      "new_id": "67a1fb2e043d2a14d69c0bf951e511f3bdb0f875",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCSuggestionResultBean.java"
    },
    {
      "type": "modify",
      "old_id": "fb1dc78e37d25304320cadecd56c08ef009c9b32",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java",
      "new_id": "4f2666b0771480174d2d9dc74a904f46a064f6a9",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java"
    },
    {
      "type": "modify",
      "old_id": "e6086e38b5696ce0f41173c23af230ed86401245",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java",
      "new_id": "a4df0e2d994189ed24e479c225b1182e324bcc73",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java"
    },
    {
      "type": "modify",
      "old_id": "4f9b5df73e69a0c6d055cccf5c74984f5e558b15",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java",
      "new_id": "31c88c583d538421dd3ce54b1d3e0a5791fe03fe",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java"
    },
    {
      "type": "modify",
      "old_id": "3808dd30802b63e998412b89328e1f8e0ccf2bc7",
      "old_mode": 33188,
      "old_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java",
      "new_id": "62b525bda6ee54e59e62fcee678bf16b480d81de",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "2d4880fb671dd0ac23d8251a8d4ae6247fb6788e",
      "new_mode": 33188,
      "new_path": "src/main/java/org/apache/nlpcraft/client/impl/beans/NCValueBean.java"
    },
    {
      "type": "modify",
      "old_id": "8bef883ae61a0d742001ffb51c49e16ac365cf8d",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/NCAskSyncTest.java",
      "new_id": "3a1050b0b20af8ffd3c078d8f8a743812d414d34",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCAskSyncTest.java"
    },
    {
      "type": "modify",
      "old_id": "78e0d1ad7874008932c5b4ab5cbdb893cb3c31ae",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/NCAskTest.java",
      "new_id": "8a97a5d6c4b839bfddbbd695b8ac7df15c19d139",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCAskTest.java"
    },
    {
      "type": "modify",
      "old_id": "7dc0e4947ebf1bd343612a37f86df861f2551fc5",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/NCClearConversationTest.java",
      "new_id": "b29e6ae6c7bc3f0a4058ff2574696924f5573751",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCClearConversationTest.java"
    },
    {
      "type": "modify",
      "old_id": "ec8d55fd17f7487a74152808ef3fd17c62ed348a",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/NCClearDialogTest.java",
      "new_id": "848d4ca44e89cca2adc5644fa5f67c1be3405a32",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCClearDialogTest.java"
    },
    {
      "type": "modify",
      "old_id": "02256027f99b3902e373b5864ae2cb5ea5f1865a",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/NCCompanyTest.java",
      "new_id": "2cb91ec54b1aa20d531454e833571dc32c3498f8",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCCompanyTest.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "89d0994b42fa3e955f0f7bc3237451273ade5536",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCModelTest1.java"
    },
    {
      "type": "rename",
      "old_id": "de9433711de5b4b89035ab5b45612574782ba2f9",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/NCModelTest.java",
      "new_id": "b02d2d79b693945d42bc844baa1df820d743ea77",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCModelTest2.java",
      "score": 75
    },
    {
      "type": "modify",
      "old_id": "b09cc71ee10161e62f3ffffc288f34c45dfbedc9",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java",
      "new_id": "933b4dc4ae3262d3b1e52c37de38b3f269fcebb4",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java"
    },
    {
      "type": "modify",
      "old_id": "2fa89817344f5e7d347aa33969a7edd749951bea",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/NCUserTest.java",
      "new_id": "fb5b9c8ea805aa76cc5784c5f449fd8eb0a68d0c",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/NCUserTest.java"
    },
    {
      "type": "modify",
      "old_id": "aaac1b33bf10467fcb2662b2a033f039f2eb237a",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/models/NCCommonSpecModel.java",
      "new_id": "48493394e251aeaaf2f160711c6b9c38d2d366cf",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/models/NCCommonSpecModel.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "9ea41a94abebcd56aa248740414e3e1349dd15a4",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/models/NCRestSpecModel.java"
    },
    {
      "type": "modify",
      "old_id": "8816a9be36493417c6049db7361668aba71c4f7d",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/models/NCSpecModelAdapter.java",
      "new_id": "19c7c424d3597d1659abf2f882555dcff57d4be7",
      "new_mode": 33188,
      "new_path": "src/test/java/org/apache/nlpcraft/client/models/NCSpecModelAdapter.java"
    },
    {
      "type": "delete",
      "old_id": "c757ca18b6c58ae69d149e841d8c544a20b5af26",
      "old_mode": 33188,
      "old_path": "src/test/java/org/apache/nlpcraft/client/models/NCSuggestionSpecModel.java",
      "new_id": "0000000000000000000000000000000000000000",
      "new_mode": 0,
      "new_path": "/dev/null"
    }
  ]
}