From: Hakim El Hattab <hakim.elhattab@gmail.com>
Date: Tue, 22 Oct 2013 12:38:59 +0000 (-0400)
Subject: merge readme conflict
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=41a19baa8e74de4f019f0276737457e148ab4dc2;p=reveal.js.git

merge readme conflict
---

41a19baa8e74de4f019f0276737457e148ab4dc2
diff --cc README.md
index 8e2cc1e,c521b90..9c98483
--- a/README.md
+++ b/README.md
@@@ -11,7 -11,7 +11,7 @@@ reveal.js comes with a broad range of f
  - [Examples](https://github.com/hakimel/reveal.js/wiki/Example-Presentations): Presentations created with reveal.js, add your own!
  - [Browser Support](https://github.com/hakimel/reveal.js/wiki/Browser-Support): Explanation of browser support and fallbacks.
  
--## Slides
++## Online Editor
  
  Presentations are written using HTML or markdown but there's also an online editor for those of you who prefer a graphical interface. Give it a try at [http://slid.es](http://slid.es).
  
@@@ -813,8 -757,8 +813,8 @@@ Some reveal.js features, like external 
  2. Install [Grunt](http://gruntjs.com/getting-started#installing-the-cli)
  
  4. Clone the reveal.js repository
 -```
 +```sh
- $ git clone git@github.com:hakimel/reveal.js.git
+ $ git clone https://github.com/hakimel/reveal.js.git
  ```
  
  5. Navigate to the reveal.js folder