summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authortv <tv@also>2011-08-06 00:59:46 +0200
committertv <tv@also>2011-08-06 00:59:46 +0200
commita8eb7d8634e7722592b5d2e02df2124a7d15e0c0 (patch)
treecdd75d91ed5fb6ab299195bb20719292fe97ba1e /.gitignore
parent47217c36082cfd39bfb0a6f94579d3380c03d74a (diff)
cholerab README: add conflicts
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions