MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

fix conflict

stix2.1
Richard Piazza 2017-05-09 15:35:44 -04:00
parent c3477b83bf
commit 075b8485e5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stix2/observables.py
View File

@ -7,10 +7,11 @@ and do not have a '_type' attribute.
from .base import _STIXBase, Observable from .base import _STIXBase, Observable
from .exceptions import ObjectConstraintError from .exceptions import ObjectConstraintError
from .properties import BinaryProperty, BooleanProperty, DictionaryProperty, \ from .properties import (BinaryProperty, BooleanProperty, DictionaryProperty,
EmbeddedObjectProperty, HashesProperty, HexProperty, IntegerProperty, \ EmbeddedObjectProperty, HashesProperty, HexProperty,
ListProperty, ObjectReferenceProperty, Property, StringProperty, \ IntegerProperty, ListProperty,
TimestampProperty, TypeProperty ObjectReferenceProperty, Property, StringProperty,
TimestampProperty, TypeProperty)
class Artifact(Observable): class Artifact(Observable):