Skip to content

Commit

Permalink
Merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Culver committed Aug 24, 2015
2 parents 0302081 + 7821bdc commit 14273e8
Showing 1 changed file with 0 additions and 61 deletions.
61 changes: 0 additions & 61 deletions _gitconfig

This file was deleted.

0 comments on commit 14273e8

Please sign in to comment.