Fix merge conflicts

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
 

stix2/sources/filters.py

@@ -1,9 +1,6 @@
 """
 Filters for Python STIX 2.0 DataSources, DataSinks, DataStores
 
-Classes:
-    Filter
-
 """
 
 import collections

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.
 

stix2/sources/taxii.py

@@ -1,11 +1,6 @@
 """
 Python STIX 2.0 TAXII Source/Sink
 
-Classes:
-    TAXIICollectionStore
-    TAXIICollectionSink
-    TAXIICollectionSource
-
 TODO:
     Test everything