Fix: Rename aleph-client -> aleph-sdk-python

Author: hoh

docs/conf.py

@@ -155,6 +155,7 @@
 html_theme_options = {
     #'sidebar_width': '300px',
     #'page_width': '1200px'
+<<<<<<< HEAD
     "logo": "logo.svg",
     "description": "Aleph Network Client",
     "github_user": "aleph-im",
@@ -171,6 +172,24 @@
     "sidebar_text": "#49443E",
     "sidebar_header": "#4B4032",
     "sidebar_collapse": False,
+=======
+    'logo': 'logo.svg',
+    'description': 'Aleph Network Client',
+    'github_user': 'aleph-im',
+    'github_repo': 'aleph-sdk-python',
+    'github_button': True,
+    'github_type': 'star',
+    'github_banner': True,
+    'travis_button': True,
+    'codecov_button': True,
+    'pre_bg': '#FFF6E5',
+    'note_bg': '#E5ECD1',
+    'note_border': '#BFCF8C',
+    'body_text': '#482C0A',
+    'sidebar_text': '#49443E',
+    'sidebar_header': '#4B4032',
+    'sidebar_collapse': False,
+>>>>>>> 7ed949e (Fix: Rename aleph-client -> aleph-sdk-python)
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
@@ -261,7 +280,12 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
+<<<<<<< HEAD
     ("index", "user_guide.tex", "aleph-sdk-python Documentation", "Aleph.im", "manual"),
+=======
+  ('index', 'user_guide.tex', u'aleph-sdk-python Documentation',
+   u'Aleph.im', 'manual'),
+>>>>>>> 7ed949e (Fix: Rename aleph-client -> aleph-sdk-python)
 ]
 
 # The name of an image file (relative to this directory) to place at the top of