Skip to content

Commit 27e476d

Browse files
authored
Merge branch 'develop' into prune_docker_macos
2 parents 7c35bb5 + a6d5f94 commit 27e476d

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
.build
55
.cache
66
.vscode
7+
.zed
78
.python-version
89
.DS_Store
910
.sanitizer-report

benchmarks/rpc/WorkQueueBenchmarks.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
#include <benchmark/benchmark.h>
3131
#include <boost/asio/steady_timer.hpp>
32-
#include <boost/asio/thread_pool.hpp>
33-
#include <boost/json/object.hpp>
3432

3533
#include <algorithm>
3634
#include <atomic>

tests/unit/data/AmendmentCenterTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include <xrpl/protocol/Indexes.h>
3333

3434
#include <algorithm>
35+
#include <functional>
3536
#include <optional>
36-
#include <stdexcept>
3737
#include <string>
3838
#include <vector>
3939

0 commit comments

Comments
 (0)