merge origin

crew102 · Oct 25, 2018 · 29ca16a · 29ca16a
2 parents bc88de4 + 4070fe7
commit 29ca16a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -27,7 +27,6 @@
 # The full version, including alpha/beta/rc tags
 release = u'0.2.0'
 
-
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.

diff --git a/makefile b/makefile
@@ -2,7 +2,7 @@ docs:
 	cd docs && sphinx-build source build
 
 dist:
-	rm dist/*
+	- rm dist/*
 	python setup.py sdist bdist_wheel
 
 upload-test:

diff --git a/reprexpy/reprex.py b/reprexpy/reprex.py
@@ -294,7 +294,11 @@ def reprex(code=None, code_file=None, venue='gh', kernel_name=None,
 
     >>> import reprexpy
     >>> file_path = reprexpy.reprex_ex('basic-example.py')
+<<<<<<< HEAD
     >>> print(reprexpy.reprex(code_file=file_path, venue='so', advertise=False))
+=======
+    >>> print(reprexpy.reprex(code_file=file_path, venue='so', si=False, advertise=False))
+>>>>>>> 4070fe73f197a63fb6c37c0481e6b39d6e371819
     # <!-- language-all: lang-py -->
         x = "hi there"
         y = " old friend"