From 76c7c3bdb377875bea8686a7d2b915538938ee1b Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 22 Jun 2021 11:16:36 -0500 Subject: Remove merge commentary --- recipes-core/images/mlinux-mtcap-test-image.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-core/images/mlinux-mtcap-test-image.bb b/recipes-core/images/mlinux-mtcap-test-image.bb index 1cef2b6..7b6ce6e 100644 --- a/recipes-core/images/mlinux-mtcap-test-image.bb +++ b/recipes-core/images/mlinux-mtcap-test-image.bb @@ -80,13 +80,10 @@ MISC_FEATURES = "minicom lrzsz nano uxfp" # Someday add wifi features # ${WIFI_FEATURES} # -<<<<<<< HEAD -======= IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils" IMAGE_INSTALL_append = " pps-tools" ->>>>>>> 28ec5c7... gpsd-conf must now be added separately to start gpsd automatically IMAGE_INSTALL += " \ ${FILESYSTEM_FEATURES} \ ${TIME_FEATURES} \ -- cgit v1.2.3