From 075b8485e55147b26ed461728b24ca4e1845d7e1 Mon Sep 17 00:00:00 2001 From: Richard Piazza Date: Tue, 9 May 2017 15:35:44 -0400 Subject: [PATCH] fix conflict --- stix2/observables.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stix2/observables.py b/stix2/observables.py index 2b245d9..a06a305 100644 --- a/stix2/observables.py +++ b/stix2/observables.py @@ -7,10 +7,11 @@ and do not have a '_type' attribute. from .base import _STIXBase, Observable from .exceptions import ObjectConstraintError -from .properties import BinaryProperty, BooleanProperty, DictionaryProperty, \ - EmbeddedObjectProperty, HashesProperty, HexProperty, IntegerProperty, \ - ListProperty, ObjectReferenceProperty, Property, StringProperty, \ - TimestampProperty, TypeProperty +from .properties import (BinaryProperty, BooleanProperty, DictionaryProperty, + EmbeddedObjectProperty, HashesProperty, HexProperty, + IntegerProperty, ListProperty, + ObjectReferenceProperty, Property, StringProperty, + TimestampProperty, TypeProperty) class Artifact(Observable):