commit after resolving conflict
authorHamed <hamed.gorjiara@gmail.com>
Tue, 20 Jun 2017 01:22:29 +0000 (18:22 -0700)
committerHamed <hamed.gorjiara@gmail.com>
Tue, 20 Jun 2017 01:22:29 +0000 (18:22 -0700)
commit5249fbe7415e60c2e0411c64031d8a60aa7cd09f
tree27d4e919be59dd3e30baddca3297aa9e7bbc5d5c
parentc32d99edd9da968bb6ea9bda22c1dd985aef27c4
parentba9db6c6d57e2140695a05dfc4040debf1542e57
commit after resolving conflict
src/Encoders/naiveelementencoder.c