diff options
| author | John Klug <john.klug@multitech.com> | 2021-06-22 11:16:36 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2021-06-22 11:16:36 -0500 |
| commit | 76c7c3bdb377875bea8686a7d2b915538938ee1b (patch) | |
| tree | 0a031b55630d47e55478bafe41039755abf2b5fa | |
| parent | 720883807b93ee158a41169a4dd2c4d0d2d42510 (diff) | |
| download | meta-mlinux-atmel-76c7c3bdb377875bea8686a7d2b915538938ee1b.tar.gz meta-mlinux-atmel-76c7c3bdb377875bea8686a7d2b915538938ee1b.tar.bz2 meta-mlinux-atmel-76c7c3bdb377875bea8686a7d2b915538938ee1b.zip | |
Remove merge commentary
| -rw-r--r-- | recipes-core/images/mlinux-mtcap-test-image.bb | 3 |
1 files changed, 0 insertions, 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} \ |