nit: fix spelling (#15908)

(cherry picked from commit 5760cf0) # Conflicts: # sdk/src/feature_set.rs
solana-labs · Mar 16, 2021 · 7c283e6 · 7c283e6
1 parent fddba08
commit 7c283e6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
@@ -144,6 +144,10 @@ lazy_static! {
         (cpi_share_ro_and_exec_accounts::id(), "Share RO and Executable accounts during cross-program invocations"),
         (skip_ro_deserialization::id(), "Skip deserialization of read-only accounts"),
         (require_stake_for_gossip::id(), "require stakes for propagating crds values through gossip #15561"),
+<<<<<<< HEAD
+=======
+        (cpi_data_cost::id(), "charge the compute budget for data passed via CPI"),
+>>>>>>> 5760cf0f4... nit: fix spelling (#15908)
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()