Fix merge conflicts

coral-xyz · Sep 15, 2024 · 0d364d5 · 0d364d5
1 parent f40f65b
commit 0d364d5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -267,7 +267,6 @@ See the [Anchor 0.29 release notes](https://www.anchor-lang.com/release-notes/0.
 
 ### Fixes
 
-- lang: Allow the `cfg` attribute above the instructions ([#2339](https://github.com/coral-xyz/anchor/pull/2339)).
 - ts: Packages no longer depend on `assert` ([#2535](https://github.com/coral-xyz/anchor/pull/2535)).
 - lang: Support for `const` in the `InitSpace` macro ([#2555](https://github.com/coral-xyz/anchor/pull/2555)).
 - cli: Support workspace inheritance ([#2570](https://github.com/coral-xyz/anchor/pull/2570)).

diff --git a/tests/misc/programs/misc/Cargo.toml b/tests/misc/programs/misc/Cargo.toml
@@ -19,7 +19,5 @@ my-feature = []
 [dependencies]
 anchor-lang = { path = "../../../../lang", features = ["init-if-needed"] }
 anchor-spl = { path = "../../../../spl" }
-spl-associated-token-account = { version = "1.1.1", features = [
- "no-entrypoint",
-] }
+spl-associated-token-account = { version = "1.1.1", features = ["no-entrypoint"] }
 bytemuck = { version = "1.4.0", features = ["derive", "min_const_generics"] }