Skip to content

Commit

Permalink
fixed merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
vltr committed Jun 18, 2019
1 parent 443bde4 commit f778261
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@
year = '2018'
author = 'Richard Kuesters'
copyright = '{0}, {1}'.format(year, author)
<<<<<<< HEAD
version = release = '0.2.4'
=======
version = release = '0.2.2'
>>>>>>> 71044f6a26d15cecc3332b5d0c75c195b607cabe

pygments_style = 'default'
templates_path = ['.']
Expand Down

0 comments on commit f778261

Please sign in to comment.