Merge branch 'master' of https://github.com/mraza007/Python-notes

mraza007 · Sep 21, 2018 · 9e10aa5 · 9e10aa5
2 parents c12e518 + f14098b
commit 9e10aa5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/docs/Contributing.md b/docs/Contributing.md
@@ -0,0 +1 @@
+## How to contribute to this repo
diff --git a/docs/index.md b/docs/index.md
@@ -0,0 +1,5 @@
+## Hello World
+You can find our docs here
+[index](files/strings.rst)
+
+## Python3
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -8,10 +8,21 @@ Welcome to Python-for-beginners's documentation!
 
 .. toctree::
    :maxdepth: 2
-   :caption: Contents:
 
 
 
+<<<<<<< HEAD:docs/source/index.rst
+=======
+Getting Started
+===============
+
+.. toctree::
+    strings
+
+
+
+>>>>>>> f14098ba3f0ea178423430bbbf9d943ecceee0e6:docs/index.rst
+
 Indices and tables
 ==================
 

diff --git a/docs/strings.rst b/docs/strings.rst
@@ -0,0 +1,4 @@
+Strings
+=======
+
+Here you can find more about strings