diff options
| author | Tobias Leich <email@froggs.de> | 2014-04-02 16:40:56 +0200 |
|---|---|---|
| committer | Tobias Leich <email@froggs.de> | 2014-04-02 16:41:10 +0200 |
| commit | f79eaed04e7027591c83ac01120a170d277eaee3 (patch) | |
| tree | a72e07ed5c604df510fcac3a7d35615a2534e28d /.gitmodules | |
| parent | 0757d2671e23f8e10e92c11910c1a3a56a352a3c (diff) | |
fix VCS conflict
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions