Commit b562c56c authored by Philipp Götze's avatar Philipp Götze
Browse files

little merge

parent 2e6302fc
......@@ -26,8 +26,8 @@
#include <unordered_map>
#include <algorithm>
#include <iterator>
#include "nvm/PTableInfo.hpp"
#include <numeric>
#include "nvml/include/libpmemobj++/allocator.hpp"
#include "nvml/include/libpmemobj++/p.hpp"
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment