summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJonatas Miguel <jonatas.df.miguel@gmail.com>2012-10-24 19:34:40 +0200
committerJonatas Miguel <jonatas.df.miguel@gmail.com>2012-10-24 19:34:40 +0200
commit982a9f27b183926b03afa707f1221d03a0867645 (patch)
tree39181bdc8443ce4483afbc3aa2fadb03b069ebc6 /.gitignore
parentb51823dde5fbae508b8ebf99258d2f514a8bece8 (diff)
fix a conflict, part 1
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions