diff options
| author | Bartek Szopka <bartek.szopka+github@gmail.com> | 2012-02-15 21:28:21 +0100 |
|---|---|---|
| committer | Bartek Szopka <bartek.szopka+github@gmail.com> | 2012-02-15 21:28:54 +0100 |
| commit | 9f1ff58480e82f143f54e5b746e1bdc4244f96f2 (patch) | |
| tree | 4c32796f47a06000d06ad0b5d529a0e1b115f344 | |
| parent | c733c1ae3803bd9e1bb9e65e478af101256728a7 (diff) | |
| download | impress.js-9f1ff58480e82f143f54e5b746e1bdc4244f96f2.tar.gz | |
conflict fix
| -rw-r--r-- | README.md | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -24,12 +24,10 @@ VERSION HISTORY **CONTAINS UNRELEASED CHANGES, MAY BE UNSTABLE** -<<<<<<< HEAD * minor CSS 3D fixes -======= * basic API to control the presentation flow from JavaScript * touch event support ->>>>>>> api + ### 0.2 ([browse](http://github.com/bartaz/impress.js/tree/0.2), [zip](http://github.com/bartaz/impress.js/zipball/0.2), [tar](http://github.com/bartaz/impress.js/tarball/0.2)) |