From 4b0dcb22b873f307085db17f02a9f521c4465f25 Mon Sep 17 00:00:00 2001 From: Steve Baer Date: Fri, 23 Oct 2020 13:34:43 -0700 Subject: [PATCH] patch for merge conflict on github --- compute_rhino3d/Util.py | 2 +- docs/conf.py | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compute_rhino3d/Util.py b/compute_rhino3d/Util.py index 3dbcf13..7d672c9 100644 --- a/compute_rhino3d/Util.py +++ b/compute_rhino3d/Util.py @@ -2,7 +2,7 @@ import json import requests -__version__ = '0.12.0' +__version__ = '0.12.1' url = 'https://compute.rhino3d.com/' authToken = '' diff --git a/docs/conf.py b/docs/conf.py index 5493558..e12d157 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,13 +20,13 @@ # -- Project information ----------------------------------------------------- project = u'compute_rhino3d' -copyright = u'2019, Robert McNeel & Associates' +copyright = u'2020, Robert McNeel & Associates' author = u'Robert McNeel & Associates' # The short X.Y version version = u'' # The full version, including alpha/beta/rc tags -release = u'0.8.0' +release = u'0.12.1' # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index 42868ed..cf3c3aa 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ setuptools.setup( name="compute_rhino3d", - version="0.12.0", + version="0.12.1", packages=['compute_rhino3d'], author="Robert McNeel & Associates", author_email="steve@mcneel.com",