forgot a conflict

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):

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,

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

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

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

graphene/types/uuid.py

@@ -6,6 +6,7 @@ from graphql.language import ast
 
 from .scalars import Scalar
 
+
 class UUID(Scalar):
     """UUID"""
 

graphene/utils/comparison_helper.py

@@ -1,3 +1,3 @@
 def raise_assertion_if(condition=None, message=None):
-	if condition:
+    if condition:
-		raise AssertionError(message)
+        raise AssertionError(message)