icu: update bbappend

Rename icu bbappend for upstream version bump.

Bug-AGL: SPEC-5147

Change-Id: I2d70bc76ec767fc26e8c704bd470904e42de4f82
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend b/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend
index cf4061e..064cda7 100644 (file)
--- a/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend
+++ b/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend
@@ -1 +1,5 @@
+<<<<<<< HEAD:meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend
 require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_74-1_agldemo.inc', '', d)}
+=======
+require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_agldemo.inc', '', d)}
+>>>>>>> fe2024e (Update bbappends for upstream version bumps):recipes-support/icu/icu_74-%.bbappend

diff --git a/meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc b/meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc
similarity index 100%
rename from meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc
rename to meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc