From 9e53e543a15aad44c9f4761d6cf009b55c957786 Mon Sep 17 00:00:00 2001
From: Kacppian <aspkaushik@gmail.com>
Date: Tue, 17 Jul 2018 22:59:43 +0530
Subject: [PATCH] forgot a conflict

---
 graphene/pyutils/version.py         | 4 ----
 graphene/types/argument.py          | 1 +
 graphene/types/base.py              | 1 +
 graphene/types/datetime.py          | 1 +
 graphene/types/schema.py            | 1 +
 graphene/types/uuid.py              | 1 +
 graphene/utils/comparison_helper.py | 4 ++--
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/graphene/pyutils/version.py b/graphene/pyutils/version.py
index 9d33209f..ab177e12 100644
--- a/graphene/pyutils/version.py
+++ b/graphene/pyutils/version.py
@@ -3,10 +3,6 @@ from __future__ import unicode_literals
 import datetime
 import os
 import subprocess
-<<<<<<< HEAD
-from .comparison_helper import raise_assertion_if
-=======
->>>>>>> parent of 41dcbdc... DRY-ed up
 
 
 def get_version(version=None):
diff --git a/graphene/types/argument.py b/graphene/types/argument.py
index 97ff3b27..326e173d 100644
--- a/graphene/types/argument.py
+++ b/graphene/types/argument.py
@@ -6,6 +6,7 @@ from .mountedtype import MountedType
 from .structures import NonNull
 from .utils import get_type
 
+
 class Argument(MountedType):
     def __init__(
         self,
diff --git a/graphene/types/base.py b/graphene/types/base.py
index 6c71e599..1b4d4034 100644
--- a/graphene/types/base.py
+++ b/graphene/types/base.py
@@ -1,6 +1,7 @@
 from ..utils.subclass_with_meta import SubclassWithMeta
 from ..utils.trim_docstring import trim_docstring
 
+
 class BaseOptions(object):
     name = None  # type: str
     description = None  # type: str
diff --git a/graphene/types/datetime.py b/graphene/types/datetime.py
index 724bf31f..3aa38c98 100644
--- a/graphene/types/datetime.py
+++ b/graphene/types/datetime.py
@@ -7,6 +7,7 @@ from graphql.language import ast
 
 from .scalars import Scalar
 
+
 class Date(Scalar):
     """
     The `Date` scalar type represents a Date
diff --git a/graphene/types/schema.py b/graphene/types/schema.py
index e54a13ca..9250f86d 100644
--- a/graphene/types/schema.py
+++ b/graphene/types/schema.py
@@ -14,6 +14,7 @@ from .definitions import GrapheneGraphQLType
 from .objecttype import ObjectType
 from .typemap import TypeMap, is_graphene_type
 
+
 def assert_valid_root_type(_type):
     if _type is None:
         return
diff --git a/graphene/types/uuid.py b/graphene/types/uuid.py
index 4d6fd316..84089a2d 100644
--- a/graphene/types/uuid.py
+++ b/graphene/types/uuid.py
@@ -6,6 +6,7 @@ from graphql.language import ast
 
 from .scalars import Scalar
 
+
 class UUID(Scalar):
     """UUID"""
 
diff --git a/graphene/utils/comparison_helper.py b/graphene/utils/comparison_helper.py
index 4a087a7c..c0dc8242 100644
--- a/graphene/utils/comparison_helper.py
+++ b/graphene/utils/comparison_helper.py
@@ -1,3 +1,3 @@
 def raise_assertion_if(condition=None, message=None):
-	if condition:
-		raise AssertionError(message)
\ No newline at end of file
+    if condition:
+        raise AssertionError(message)