diff options
| author | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
| commit | 9ff43d7c8e076aaa8790bacbd4b2cfe636a55a97 (patch) | |
| tree | e1e0265b18ffc854f24209cb36b2c836100f099b /extractor/alignment.h | |
| parent | e59cdac5253df7ab57296d347245d1a8f4d8b287 (diff) | |
| parent | 407b100cd3e4ae987504b53101151fba287ad999 (diff) | |
fix merge conflict
Diffstat (limited to 'extractor/alignment.h')
| -rw-r--r-- | extractor/alignment.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/extractor/alignment.h b/extractor/alignment.h index dc5a8b55..76c27da2 100644 --- a/extractor/alignment.h +++ b/extractor/alignment.h @@ -4,13 +4,11 @@ #include <string> #include <vector> -#include <boost/filesystem.hpp> #include <boost/serialization/serialization.hpp> #include <boost/serialization/split_member.hpp> #include <boost/serialization/utility.hpp> #include <boost/serialization/vector.hpp> -namespace fs = boost::filesystem; using namespace std; namespace extractor { |