aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-03-19 11:38:52 -0400
committerjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-03-19 11:38:52 -0400
commit2d98cb411b617ae1548f1c64c9d2e9801e4ab73d (patch)
tree254e100e2979c028b2cf15277f55b81aa3730197 /README.md
parent4a68b488b10e6f32e154f3316eb0026b7fa33b10 (diff)
parent3c091fa90c6a4251777f8eea4fbe3751e76a785f (diff)
downloadlearn-optimize-2d98cb411b617ae1548f1c64c9d2e9801e4ab73d.tar.gz
fixed merge conflicts
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions