diff options
| author | Hakim El Hattab | 2016-01-08 10:48:10 +0100 |
|---|---|---|
| committer | Hakim El Hattab | 2016-01-08 10:48:10 +0100 |
| commit | c3919756f1a50fe696d7b690c64f0c9e7f5f6c62 (patch) | |
| tree | be10f480b169c4e6f66861163856dfc70f66ff1f /css/reveal.css | |
| parent | 2a8646543476bf39475606aa9d5aef622675f302 (diff) | |
| parent | d6d4c68013f2d77d7eb4c967c6500885c333955e (diff) | |
resolve conflict
Diffstat (limited to 'css/reveal.css')
0 files changed, 0 insertions, 0 deletions