Resolve merge conflicts

2024-05-20 11:12:24 +08:00
parent ccaddf7fdb
commit 0e33a1b647
24 changed files with 172 additions and 183 deletions
--- a/include/stellar/stellar.h
+++ b/include/stellar/stellar.h
@@ -9,8 +9,6 @@ extern "C"
 #include <stdint.h>
 #include "stellar/session.h"

-#include "session.h"
-
 struct session;
 struct stellar;