manifest: zephyr & mcuboot update

To version which uses dedicated method for S2RAM
resume operation.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Author: nvlsianpu

west.yml

@@ -65,7 +65,11 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
+<<<<<<< HEAD
       revision: 23f56e05b481d0a7e674d299735388f574272bfa
+=======
+      revision: pull/3285/head
+>>>>>>> bcdbe3aced (manifest: zephyr & mcuboot update)
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -128,7 +132,11 @@ manifest:
           compare-by-default: true
     - name: mcuboot
       repo-path: sdk-mcuboot
+<<<<<<< HEAD
       revision: 754f9586875dd72de367704e42c2121eb60696c3
+=======
+      revision: pull/536/head
+>>>>>>> bcdbe3aced (manifest: zephyr & mcuboot update)
       path: bootloader/mcuboot
     - name: qcbor
       url: https://github.com/laurencelundblade/QCBOR