Skip to content

Commit 35c22e2

Browse files
committed
fix conflict
1 parent 4439f8d commit 35c22e2

File tree

2 files changed

+0
-149
lines changed

2 files changed

+0
-149
lines changed

src/iceberg/table_metadata.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
#include <nlohmann/json.hpp>
2727

28-
#include "../../build/_deps/fmt-src/include/fmt/color.h"
2928
#include "iceberg/exception.h"
3029
#include "iceberg/file_io.h"
3130
#include "iceberg/json_internal.h"

src/iceberg/update_requirement.cc

Lines changed: 0 additions & 148 deletions
This file was deleted.

0 commit comments

Comments
 (0)