diff options
Diffstat (limited to 'meta-agl-html5-demo')
| -rw-r--r-- | meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend | 4 | ||||
| -rw-r--r-- | meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc (renamed from meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc) | 0 |
2 files changed, 4 insertions, 0 deletions
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 cf4061e92..064cda797 100644 --- 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 index 957fe0838..957fe0838 100644 --- a/meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc +++ b/meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc |