diff options
| -rw-r--r-- | meta/conf/distro/include/private/distro_base_utils_1.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/distro/include/private/distro_base_utils_1.inc b/meta/conf/distro/include/private/distro_base_utils_1.inc index d99c583da2..40578c27c5 100644 --- a/meta/conf/distro/include/private/distro_base_utils_1.inc +++ b/meta/conf/distro/include/private/distro_base_utils_1.inc @@ -324,6 +324,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-makedevs = "n/a" RECIPE_LATEST_RELEASE_DATE_pn-makedevs = "n/a" RECIPE_COMMENTS_pn-makedevs = "" RECIPE_MAINTAINER_pn-makedevs = "Dongxiao Xu <dongxiao.xu@intel.com>" +<<<<<<< HEAD:meta/conf/distro/include/private/distro_base_utils_1.inc RECIPE_STATUS_pn-cwautomacros = "green" DEPENDENCY_CHECK_pn-cwautomacros = "not done" |