From 66e57ced25961e1c68243635568d50a2cf7a40be Mon Sep 17 00:00:00 2001
From: Chris Lenk <clenk@mitre.org>
Date: Fri, 6 Oct 2017 14:19:09 -0400
Subject: [PATCH] Fix merge conflicts

---
 stix2/sources/filesystem.py | 10 +++-------
 stix2/sources/filters.py    |  3 ---
 stix2/sources/memory.py     |  5 -----
 stix2/sources/taxii.py      |  5 -----
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/stix2/sources/filesystem.py b/stix2/sources/filesystem.py
index 02cde6c..a7e3e2c 100644
--- a/stix2/sources/filesystem.py
+++ b/stix2/sources/filesystem.py
@@ -1,11 +1,6 @@
 """
 Python STIX 2.0 FileSystem Source/Sink
 
-Classes:
-    FileSystemStore
-    FileSystemSink
-    FileSystemSource
-
 TODO:
     Test everything
 """
@@ -160,8 +155,9 @@ class FileSystemSource(DataSource):
 
         all_data = self.query(query=query, _composite_filters=_composite_filters)
 
-        if len(all_data):
-            stix_obj = parse(sorted(all_data, key=lambda k: k['modified'])[0])
+        if all_data:
+            stix_obj = sorted(all_data, key=lambda k: k['modified'])[0]
+            stix_obj = parse(stix_obj)
         else:
             stix_obj = None
 
diff --git a/stix2/sources/filters.py b/stix2/sources/filters.py
index 8e77f56..a662eec 100644
--- a/stix2/sources/filters.py
+++ b/stix2/sources/filters.py
@@ -1,9 +1,6 @@
 """
 Filters for Python STIX 2.0 DataSources, DataSinks, DataStores
 
-Classes:
-    Filter
-
 """
 
 import collections
diff --git a/stix2/sources/memory.py b/stix2/sources/memory.py
index 1886e60..f0fda8b 100644
--- a/stix2/sources/memory.py
+++ b/stix2/sources/memory.py
@@ -1,11 +1,6 @@
 """
 Python STIX 2.0 Memory Source/Sink
 
-Classes:
-    MemoryStore
-    MemorySink
-    MemorySource
-
 TODO:
     Run through tests again, lot of changes.
 
diff --git a/stix2/sources/taxii.py b/stix2/sources/taxii.py
index 228466c..c132122 100644
--- a/stix2/sources/taxii.py
+++ b/stix2/sources/taxii.py
@@ -1,11 +1,6 @@
 """
 Python STIX 2.0 TAXII Source/Sink
 
-Classes:
-    TAXIICollectionStore
-    TAXIICollectionSink
-    TAXIICollectionSource
-
 TODO:
     Test everything