Update memory.c

Signed-off-by: DINESHKUMAR <119919751+DINESHKUMARK1@users.noreply.github.com>
thesofproject · Oct 8, 2024 · b753145 · b753145
1 parent 4530310
commit b753145
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/platform/amd/rembrandt/lib/memory.c b/src/platform/amd/rembrandt/lib/memory.c
@@ -10,10 +10,7 @@
 #include <sof/platform.h>
 #include <rtos/sof.h>
 #include <ipc/topology.h>
-<<<<<<< Updated upstream
-=======
 
->>>>>>> Stashed changes
 #ifndef __ZEPHYR__
 /* Heap blocks for system runtime */
 static SHARED_DATA struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64];