diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-03-16 22:33:33 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-03-19 10:01:07 +0100 |
| commit | 3eb15d2eabb0b170c96de7241aa2eed7d5d27879 (patch) | |
| tree | ff363b717ba0f591904a55388b5e09683c1f7165 /storageapi | |
| parent | 9335569e415a04beaab3ebcb62e02faf37be7ad3 (diff) | |
Remove DocumentList with children...
Conflicts:
storage/src/tests/persistence/filestorage/filestormanagertest.cpp
Resolve merge conflict.
Diffstat (limited to 'storageapi')
| -rw-r--r-- | storageapi/src/vespa/storageapi/message/datagram.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storageapi/src/vespa/storageapi/message/datagram.h b/storageapi/src/vespa/storageapi/message/datagram.h index 64649b43068..0c221a3270a 100644 --- a/storageapi/src/vespa/storageapi/message/datagram.h +++ b/storageapi/src/vespa/storageapi/message/datagram.h @@ -5,7 +5,6 @@ #include <vespa/storageapi/messageapi/storagecommand.h> #include <vespa/storageapi/messageapi/storagereply.h> #include <vespa/storageapi/defs.h> -#include <vespa/vdslib/container/documentlist.h> namespace storage::api { |