fixing issue # 87 to fix typo for file video.rst

Author: omshinde

docs/source/chapters/video.rst

@@ -7,22 +7,6 @@
   Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
   ****************************************************************************
 
-<<<<<<< HEAD
-Video Tutorials for Workshops
-###############################################################################
-
-
-Workshop 4-Prepare Data
-===============================================================================
-
-Video Practicle for 4.1(Prepare the database), see `here <https://www.youtube.com/watch?v=oxvzBJtw3mI>`_. 
-
-
-Video Practicle for 4.2(Get the Workshop Data), see `here <https://www.youtube.com/watch?v=9W2FnzmUPRg>`_.
-
-
-Video Practicle for 4.3(Upload Data to the database), see `here <https://www.youtube.com/watch?v=p2uz5udMUdk>`_.
-=======
 Video Tutorials for Workshop
 ###############################################################################
 
@@ -33,4 +17,3 @@ Chapter 4
 * Video for section 4.1: `Prepare the database <https://www.youtube.com/watch?v=oxvzBJtw3mI>`__. 
 * Video for section 4.2: `Get the Workshop Data <https://www.youtube.com/watch?v=9W2FnzmUPRg>`__.
 * Video for section 4.3: `Upload Data to the database <https://www.youtube.com/watch?v=p2uz5udMUdk>`__.
->>>>>>> upstream/master

docs/source/index.rst

@@ -36,3 +36,4 @@ pgRouting Workshop
    chapters/additional_installation.rst
    chapters/osm2pgrouting
    chapters/video.rst
+   chapters/internet_examples.rst