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 | 02647059daa297e7b2b3ca3a2c03d848ae3ad9f2 (patch) | |
| tree | a5d2b5d66a8cff38a9422378c66861a3fb493e80 /extractor/alignment.h | |
| parent | 7b2cd4e93114baaa329c483a98d6f7999aad1ba0 (diff) | |
| parent | 7d391d8eb88d27c5637042fefe2d27e7b12f5587 (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 { |