fix merge conflict with master

src/swcio.cpp

@@ -3,6 +3,7 @@
 #include <map>
 #include <sstream>
 #include <unordered_set>
+
 #include <swcio.hpp>
 
 namespace nestmc
@@ -39,7 +40,7 @@ void cell_record::check_consistency() const
     if (id_ < 0) {
         throw std::invalid_argument("negative ids not allowed");
     }
-        
+
     if (parent_id_ < -1) {
         throw std::invalid_argument("parent_id < -1 not allowed");
     }

tests/test_swcio.cpp

@@ -224,7 +224,7 @@ TEST(swc_parser, from_allen_db)
 TEST(swc_parser, input_cleaning)
 {
     using namespace nestmc::io;
-    
+
     {
         // Check duplicates
         std::stringstream is;
@@ -260,7 +260,7 @@ TEST(swc_parser, input_cleaning)
         std::array<cell_record::id_type, 4> expected_id_list = {{ 0, 1, 2, 3 }};
         auto cells = swc_read_cells(is);
         ASSERT_EQ(4u, cells.size());
-        
+
         auto expected_id = expected_id_list.cbegin();
         for (const auto &c : cells) {
             EXPECT_EQ(*expected_id, c.id());

vector @ a8dfadd4

-Subproject commit 9c86d0a84efed0dd739888503d275378df67fe71
+Subproject commit a8dfadd460262ebbc1bc22b159efe9e33ad1d359