This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/AFLAdmin.cdc b/AFLAdmin_updated.cdc | |
index 2841095..f6fed29 100644 | |
--- a/AFLAdmin.cdc | |
+++ b/AFLAdmin_updated.cdc | |
@@ -20,7 +20,7 @@ access(all) contract AFLAdmin { | |
} | |
access(all) fun updateImmutableData(templateID:UInt64, immutableData:{String: AnyStruct}){ | |
- let templateRef: &AFLNFT.Template? = &AFLNFT.allTemplates[templateID] | |
+ let templateRef: &AFLNFT.Template? = AFLNFT.allTemplates[templateID] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit de876037727966de86c508737632a5fa9ee750fd | |
Merge: 6713e43fc eecd39315 | |
Author: Supun Setunga <supun.setunga@gmail.com> | |
Date: Fri Mar 15 15:49:05 2024 -0700 | |
Merge branch 'master' of https://github.com/onflow/cadence into supun/atree-inlining-merge-master | |
diff --git a/go.mod b/go.mod | |
remerge CONFLICT (content): Merge conflict in go.mod | |
index fb60135c9..fb1d18a6c 100644 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 2f8dfa0c9285069489a0d9f39f459a9b068f331f | |
Merge: 5304857251 7f0980eff8 | |
Author: Supun Setunga <supun.setunga@gmail.com> | |
Date: Wed Jan 24 12:37:33 2024 -0800 | |
Merge master to feature/stable-cadence | |
diff --git a/fvm/environment/account_key_updater_test.go b/fvm/environment/account_key_updater_test.go | |
remerge CONFLICT (content): Merge conflict in fvm/environment/account_key_updater_test.go | |
index d08b69a303..bfb2fa9d2c 100644 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 1a1595ccba3da833465d2ebc35e7ad919edb3d15 | |
Merge: 2a2c540f3 32ddd355c | |
Author: Supun Setunga <supun.setunga@gmail.com> | |
Date: Fri Jan 5 11:27:44 2024 -0800 | |
Merge branch 'master' of https://github.com/onflow/cadence into supun/sync-range-type | |
diff --git a/encoding/ccf/decode.go b/encoding/ccf/decode.go | |
remerge CONFLICT (content): Merge conflict in encoding/ccf/decode.go | |
index e6f9efe60..6a3df5b48 100644 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit ee46be92ede193a06c9123e2d37370467c878bd6 | |
Merge: 787812ff3 b48fd6b85 | |
Author: Supun Setunga <supun.setunga@gmail.com> | |
Date: Mon Dec 4 14:06:33 2023 -0800 | |
Merge branch 'master' of https://github.com/onflow/cadence into supun/sc-sync-master | |
diff --git a/encoding/ccf/decode_type.go b/encoding/ccf/decode_type.go | |
remerge CONFLICT (content): Merge conflict in encoding/ccf/decode_type.go | |
index 8dd68597a..cd190c308 100644 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 3e084c4d3b144fa86e2951f826d2d2d6bd641f36 | |
Merge: 01a42f326 e878449cf | |
Author: Supun Setunga <supun.setunga@gmail.com> | |
Date: Wed Oct 25 10:11:03 2023 -0700 | |
Merge branch 'master' of https://github.com/onflow/cadence into supun/sync-stable-cadence-master | |
diff --git a/npm-packages/cadence-parser/package.json b/npm-packages/cadence-parser/package.json | |
remerge CONFLICT (content): Merge conflict in npm-packages/cadence-parser/package.json | |
index 5be44e987..1ffb0dc10 100644 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import java.io.FileWriter; | |
import java.io.IOException; | |
import java.nio.file.Path; | |
import java.nio.file.Paths; | |
import java.nio.file.Files; | |
import java.util.ArrayList; | |
import java.util.Arrays; | |
import java.util.List; | |
import java.util.stream.Stream; |