From ae39424c5a1aabc9dc027724e1281e5a03e1d530 Mon Sep 17 00:00:00 2001
From: Daniel Ching <carterbox@users.noreply.github.com>
Date: Mon, 8 Oct 2018 12:48:38 -0500
Subject: [PATCH] MAI: Update version texts

---
 VERSION            | 2 +-
 meta.yaml          | 2 +-
 tomopy/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 65087b4f5..26aaba0e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.4
+1.2.0
diff --git a/meta.yaml b/meta.yaml
index 912f99746..797b977f5 100644
--- a/meta.yaml
+++ b/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: tomopy
-  version: '1.1.4'
+  version: '1.2.0'
 
 source:
   # git_url: https://github.com/tomopy/tomopy.git
diff --git a/tomopy/__init__.py b/tomopy/__init__.py
index e83f42324..b4dcc6a39 100644
--- a/tomopy/__init__.py
+++ b/tomopy/__init__.py
@@ -49,7 +49,7 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
-__version__ = '1.1.4'
+__version__ = '1.2.0'
 
 from ._fft_loader import fft_impl
 from tomopy.misc.corr import *