Merge branch 'main' of github.com:lambdaclass/cairo-vm into cairo-1-a…

…ir-private-input

CHANGELOG.md

@@ -2,18 +2,31 @@
 
 #### Upcoming Changes
 
+<<<<<<< HEAD
 * feat: Add `air_private_input` flag to `cairo1-run` [#1559] (https://github.com/lambdaclass/cairo-vm/pull/1559)
 
 * feat: Implement air_private_input [#1552](https://github.com/lambdaclass/cairo-vm/pull/1552)
 
+=======
+>>>>>>> 1a78237b32c9489e120c4c920bff548bf2a83b89
 * feat: Add `args` flag to `cairo1-run` [#15551] (https://github.com/lambdaclass/cairo-vm/pull/15551)
 
 * feat: Add `air_public_input` flag to `cairo1-run` [#1539] (https://github.com/lambdaclass/cairo-vm/pull/1539)
 
+<<<<<<< HEAD
+=======
+* feat: Implement air_private_input [#1552](https://github.com/lambdaclass/cairo-vm/pull/1552)
+
+>>>>>>> 1a78237b32c9489e120c4c920bff548bf2a83b89
 * feat: Add `proof_mode` flag to `cairo1-run` [#1537] (https://github.com/lambdaclass/cairo-vm/pull/1537)
   * The cairo1-run crate no longer compiles and executes in proof_mode by default
   * Add flag `proof_mode` to cairo1-run crate. Activating this flag will enable proof_mode compilation and execution
 
+<<<<<<< HEAD
+=======
+* dev: bump cairo 1 compiler dep to 2.4 [#1530](https://github.com/lambdaclass/cairo-vm/pull/1530)
+
+>>>>>>> 1a78237b32c9489e120c4c920bff548bf2a83b89
 #### [1.0.0-rc0] - 2024-1-5
 
 * feat: Use `ProjectivePoint` from types-rs in ec_op builtin impl [#1532](https://github.com/lambdaclass/cairo-vm/pull/1532)