Skip to content

Commit

Permalink
Merge v1.5.1 feature branch with dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Kryptoxic committed May 3, 2020
1 parent 1dcecae commit abac560
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ endif
include $(BOLOS_SDK)/Makefile.defines

#Swap /44'/10343'
<<<<<<< HEAD
APP_LOAD_PARAMS= --path "2147483692/2147493991" --curve secp256k1 $(COMMON_LOAD_PARAMS) --appFlags 0x40
=======
APP_LOAD_PARAMS= --path "2147483692/2147493991" --curve secp256k1 $(COMMON_LOAD_PARAMS) --appFlags 0x240
>>>>>>> v1.5.1
APPNAME = "Swap"

ifeq ($(TARGET_NAME),TARGET_BLUE)
Expand Down Expand Up @@ -67,11 +63,7 @@ endif

#DEFINES += IOCRYPT
## Debug options
<<<<<<< HEAD
#DEFINES += DEBUG_HWDEVICE
=======
DEFINES += DEBUG_HWDEVICE
>>>>>>> v1.5.1
DEFINES += IODUMMYCRYPT
#DEFINES += IONOCRYPT

Expand Down

0 comments on commit abac560

Please sign in to comment.