Merge unmerged code (sorry)

ubclaunchpad · Jun 17, 2017 · 9713590 · 9713590
1 parent 868352f
commit 9713590
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/app/app.go b/app/app.go
@@ -64,7 +64,6 @@ func Run(cfg conf.Config) {
 	// peer is running
 	go peer.MaintainConnections()
 	select {}
-<<<<<<< HEAD
 }
 
 // RequestHandler is called every time a peer sends us a request message expect
@@ -95,9 +94,8 @@ func PushHandler(push *msg.Push) {
 	default:
 		// Invalid resource type. Ignore
 	}
-=======
+
 	// Ask target for its peers
 	// Connect to these peers until we have enough peers
 	// Download the blockchain
->>>>>>> 63-app-skeleton
 }