rebase main

starcoinorg · Sep 16, 2022 · 2bb4474 · 2bb4474
1 parent 84b2079
commit 2bb4474
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -312,11 +312,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-<<<<<<< HEAD
-  source_digest: B85EC5CCB8E021D9974D19AD20C43DBC20D2AE625A72A096A5BAED676B5D9F1F
-=======
-  source_digest: D37C0F2BCF8E494AE8B930EDBAAD0ECA7D6749BB7B5D7D340B743E3B94B17846
->>>>>>> fix
+  source_digest: DC60876727975D2C568C06813162A81120B13D4F6A6B636E13364139A16514B3
   build_flags:
     dev_mode: false
     test_mode: false