| commit | 3fd9fa7000197330f562949612bc5cd6ee67bd7d | [log] [tgz] |
|---|---|---|
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | Thu Mar 20 21:25:35 2014 +0000 |
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | Thu Mar 20 21:25:35 2014 +0000 |
| tree | e2b6f2e6afef728a9fe8d4721a6664a3d4d89aad | |
| parent | cf40f73c4019a08de47da53f0c7f1d8ae0e9af32 [diff] | |
| parent | 0e1c5ce0392cfbf44b2cb871295a535149af016a [diff] |
Resolve conflicts upon pull.