[FOLD] Resolve merge conflict with 1.10.0-b2

XRPLF · Nov 10, 2022 · dd7f8db · dd7f8db
1 parent 1e3a9e1
commit dd7f8db
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/ripple/rpc/handlers/AMMInfo.cpp b/src/ripple/rpc/handlers/AMMInfo.cpp
@@ -22,7 +22,6 @@
 #include <ripple/net/RPCErr.h>
 #include <ripple/protocol/Issue.h>
 #include <ripple/rpc/Context.h>
-#include <ripple/rpc/impl/GRPCHelpers.h>
 #include <ripple/rpc/impl/RPCHelpers.h>
 #include <grpcpp/support/status.h>
 

diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp
@@ -20,7 +20,6 @@
 #include <ripple/app/misc/AMM.h>
 #include <ripple/basics/random.h>
 #include <ripple/protocol/jss.h>
-#include <ripple/rpc/impl/GRPCHelpers.h>
 #include <ripple/rpc/impl/RPCHelpers.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/Env.h>