Test

depends/Makefile

@@ -4,12 +4,8 @@ SOURCES_PATH ?= $(BASEDIR)/sources
 BASE_CACHE ?= $(BASEDIR)/built
 SDK_PATH ?= $(BASEDIR)/SDKs
 NO_WALLET ?=
-<<<<<<< HEAD
 NO_UPNP ?=
 FALLBACK_DOWNLOAD_PATH ?= https://supernet/depends-sources
-=======
-PRIORITY_DOWNLOAD_PATH ?= https://z.cash/depends-sources
->>>>>>> zcash/master
 
 BUILD ?= $(shell ./config.guess)
 HOST ?= $(BUILD)

depends/funcs.mk

@@ -22,12 +22,8 @@ endef
 define fetch_file
 (test -f $$($(1)_source_dir)/$(4) || \
   ( mkdir -p $$($(1)_download_dir) && echo Fetching $(1)... && \
-<<<<<<< HEAD
-  ( $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(2)/$(3)" ) && \
-=======
   ( $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(PRIORITY_DOWNLOAD_PATH)/$(4)" || \
     $(build_DOWNLOAD) "$$($(1)_download_dir)/$(4).temp" "$(2)/$(3)" ) && \
->>>>>>> zcash/master
     echo "$(5)  $$($(1)_download_dir)/$(4).temp" > $$($(1)_download_dir)/.$(4).hash && \
     $(build_SHA256SUM) -c $$($(1)_download_dir)/.$(4).hash && \
     mv $$($(1)_download_dir)/$(4).temp $$($(1)_source_dir)/$(4) && \