summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Reiss <jreiss@multitech.com>2018-07-11 13:06:50 -0500
committerJason Reiss <jreiss@multitech.com>2018-07-11 13:06:50 -0500
commit12b01762ccf11431ca44f9056681b6063fbd294e (patch)
tree5d49730a9254c7bb8e43a22f1adf6d831dbf1add
parent86d3fd8e3e86bb3a30d55c3719c77d9ebb7c3604 (diff)
downloadmeta-mlinux-12b01762ccf11431ca44f9056681b6063fbd294e.tar.gz
meta-mlinux-12b01762ccf11431ca44f9056681b6063fbd294e.tar.bz2
meta-mlinux-12b01762ccf11431ca44f9056681b6063fbd294e.zip
fix merged changes to pkt fwd geo recipe
-rw-r--r--recipes-connectivity/lora/lora-packet-forwarder-geolocation_5.1.0.bb5
1 files changed, 0 insertions, 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 \