)]}'
{
  "commit": "36369ab63c2acfbff111b20db189c6c38bfc15c8",
  "tree": "478be6f74bd4555e8ae798703e44469a88364b09",
  "parents": [
    "28fcb5ca2af7047b746ae1b628766c907a67d3c5"
  ],
  "author": {
    "name": "Benoit Steiner",
    "email": "benoit.steiner.goog@gmail.com",
    "time": "Thu May 26 13:39:39 2016 -0700"
  },
  "committer": {
    "name": "Benoit Steiner",
    "email": "benoit.steiner.goog@gmail.com",
    "time": "Thu May 26 13:39:39 2016 -0700"
  },
  "message": "Resolved merge conflicts\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "01bccfd26bf1bc8fbc20459459d691e0f5d2ecc4",
      "old_mode": 33188,
      "old_path": "unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h",
      "new_id": "99a09c05895a0c28e9fd481e606c90c82bc4ecaa",
      "new_mode": 33188,
      "new_path": "unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h"
    },
    {
      "type": "modify",
      "old_id": "f0e8f3bc0968cf4a51aaa220ac213919368bc810",
      "old_mode": 33188,
      "old_path": "unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h",
      "new_id": "4f2dfcb7a1981dd006f3ebf994acaaf97054e24a",
      "new_mode": 33188,
      "new_path": "unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h"
    },
    {
      "type": "modify",
      "old_id": "71f79ab7297226ab5449a35bfd17ff2c05796493",
      "old_mode": 33188,
      "old_path": "unsupported/test/cxx11_tensor_of_float16_cuda.cu",
      "new_id": "34e9f54a0a9b8cd47cbcff84a8f12e9403bbb69e",
      "new_mode": 33188,
      "new_path": "unsupported/test/cxx11_tensor_of_float16_cuda.cu"
    }
  ]
}
