From 12b01762ccf11431ca44f9056681b6063fbd294e Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Wed, 11 Jul 2018 13:06:50 -0500 Subject: fix merged changes to pkt fwd geo recipe --- recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb index f6e62f8..dd9425a 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb @@ -13,12 +13,7 @@ PR = "r3" SRCREV = "v${PV}" -<<<<<<< Updated upstream -SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm926ejste_${PV}-${PSR}.tar.gz \ - file://lora-packet-forwarder-geolocation.logrotate.conf \ -======= SRC_URI = "http://multitech.net/downloads/lora-packet-forwarder-geolocation_arm926ejste_${PV}.tar.gz \ ->>>>>>> Stashed changes file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_EU868 \ file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_full_diversity_JP920 \ file://global_conf.json.MTAC_LORA_2_1_loc_dual_antenna_8ch_partial_diversity_EU868 \ -- cgit v1.2.3