diff options
author | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
---|---|---|
committer | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
commit | 062d8af12f2bcad39c47b42295b69f44f878768f (patch) | |
tree | a455fb5dd1a3c01ca3fa6e2ddd5e368040e32eaa /training/pro | |
parent | b8bf706976720527b455eb665fe94f907e372b65 (diff) | |
parent | f83186887c94b2ff8b17aefcd0b395f116c09eb6 (diff) |
merge w/ upstream
Diffstat (limited to 'training/pro')
-rw-r--r-- | training/pro/mr_pro_map.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/training/pro/mr_pro_map.cc b/training/pro/mr_pro_map.cc index eef40b8a..a5e6e48f 100644 --- a/training/pro/mr_pro_map.cc +++ b/training/pro/mr_pro_map.cc @@ -2,7 +2,6 @@ #include <iostream> #include <fstream> #include <vector> -#include <tr1/unordered_map> #include <boost/functional/hash.hpp> #include <boost/shared_ptr.hpp> |