diff options
| author | Robin Krahl <me@robin-krahl.de> | 2017-03-12 20:54:42 +0100 |
|---|---|---|
| committer | Robin Krahl <me@robin-krahl.de> | 2017-03-12 21:01:37 +0100 |
| commit | c2212cc8210559272784110dffd49ef8786bc5fb (patch) | |
| tree | 424dcd73eecafdb9d9b0df8bdaa75f942b2be818 /.gitignore | |
| parent | b623219eeff78c855c851b73c045b034c9aa06b0 (diff) | |
| parent | 6d52315dbce8f1a83c22b6d340d4f178ad7767fd (diff) | |
| download | dotfiles-c2212cc8210559272784110dffd49ef8786bc5fb.tar.gz dotfiles-c2212cc8210559272784110dffd49ef8786bc5fb.tar.bz2 | |
fix merge conflict
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions