commit after resolving conflicts
authorHamed <hamed.gorjiara@gmail.com>
Thu, 15 Jun 2017 19:56:05 +0000 (12:56 -0700)
committerHamed <hamed.gorjiara@gmail.com>
Thu, 15 Jun 2017 19:56:05 +0000 (12:56 -0700)
commit70b6717f45d3d104316e652522f4e7b0c02186b2
treeebc797cba37bb6ffee3f62d9f6e31619510874e8
parentc901d86ec2dca856e679c77eb52310791048887a
parent84245f9abf88882d83e3b9ddfed43ab3abf8638f
commit after resolving conflicts