coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-27 04:48:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed git conflict marker

Browse Source
This commit is contained in:
jwellbelove 2017-03-03 10:14:44 +00:00
parent 8fdea39e30
commit 2f2a2350e4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/algorithm.h
View File

@ -695,7 +695,6 @@ namespace etl
}
return std::pair<TDestinationTrue, TDestinationFalse>(destination_true, destination_false);
>>>>>>> origin/development
}
}