From da9b1b3f5873e30b8934b3aeaa08da80c305fead Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 6 May 2016 15:42:21 -0400 Subject: [PATCH] merge conflicts --- lbrynet/lbrynet_daemon/LBRYDaemonServer.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py index 92161aaa9..086786d83 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py @@ -1,5 +1,4 @@ import logging -import subprocess import os import shutil import json @@ -273,11 +272,13 @@ class LBRYDaemonServer(object): return defer.succeed("user-specified") else: log.info("User specified UI directory doesn't exist, using " + branch) + elif branch == "HEAD": + log.info("Using UI branch: " + branch) + self._git_url = "https://api.github.com/repos/lbryio/lbry-web-ui/git/refs/heads/master" + self._dist_url = "https://raw.githubusercontent.com/lbryio/lbry-web-ui/master/dist.zip" else: log.info("Using UI branch: " + branch) - if branch == "HEAD": - branch = "master" - self._git_url = "https://api.github.com/repos/lbryio/lbry.io/git/refs/heads/%s" % branch + self._git_url = "https://api.github.com/repos/lbryio/lbry-web-ui/git/refs/heads/%s" % branch self._dist_url = "https://raw.githubusercontent.com/lbryio/lbry-web-ui/%s/dist.zip" % branch d = self._up_to_date()