aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJean Pouget-Abadie <jean.pougetabadie@gmail.com>2015-04-14 17:45:31 -0400
committerJean Pouget-Abadie <jean.pougetabadie@gmail.com>2015-04-14 17:45:31 -0400
commit99e58e7ed247b3e8594235b452bd9a8bc6971bfb (patch)
treed2a4377e4652ecc603f8cec63fa356e70bb1fa7c /.gitignore
parent629bb1530f7b37db89ecfa2d9e5492d825801a2b (diff)
parentead8ef85b50848f078a360b040f59ea962821cb4 (diff)
downloadlearn-optimize-99e58e7ed247b3e8594235b452bd9a8bc6971bfb.tar.gz
merge conflicts
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions