just prior to 0.2.0 release

.goreleaser.yml

@@ -42,8 +42,8 @@ dockers:
     binaries:
     - daoctl
     image_templates:
-    - "dsmaxds/daoctl:latest"
-    - "dsmaxds/daoctl:{{ .Tag }}"
+    - "dappdever/daoctl:latest"
+    - "dappdever/daoctl:{{ .Tag }}"
     dockerfile: Dockerfile
     extra_files:
     - daoctl.yaml

cmd/serve.go

@@ -265,23 +265,15 @@ var serveCmd = &cobra.Command{
 
 				hypha, err := getTokenSupply(ctx, api, viper.GetString("RewardToken.Contract"), viper.GetString("RewardToken.Symbol"))
 				if err == nil {
-<<<<<<< Updated upstream
 					hyphaSupply.Set(assetToFloat(&hypha))
-=======
-					hyphaSupply.Set(hypha)
->>>>>>> Stashed changes
 				} else {
 					errorCount.Add(1)
 					log.Println("Retrieval error: supply: token contract: "+viper.GetString("RewardToken.Contract")+" symbol: "+viper.GetString("RewardToken.Symbol"), err)
 				}
 
 				husd, err := getTokenSupply(ctx, api, viper.GetString("Treasury.TokenContract"), viper.GetString("Treasury.Symbol"))
 				if err == nil {
-<<<<<<< Updated upstream
 					husdSupply.Set(assetToFloat(&husd))
-=======
-					husdSupply.Set(husd)
->>>>>>> Stashed changes
 				} else {
 					errorCount.Add(1)
 					log.Println("Retrieval error: supply: token contract: "+viper.GetString("Treasury.TokenContract")+" symbol: "+viper.GetString("Treasury.Symbol"), err)
@@ -297,7 +289,6 @@ var serveCmd = &cobra.Command{
 
 				escrowedSeeds, err := getTokenBalance(ctx, api, viper.GetString("SeedsTokenContract"), viper.GetString("EscrowContract"), "SEEDS")
 				if err == nil {
-<<<<<<< Updated upstream
 					escrowedSeedsBalance.Set(assetToFloat(&escrowedSeeds))
 				} else {
 					errorCount.Add(1)
@@ -321,9 +312,6 @@ var serveCmd = &cobra.Command{
 				proposals, err := getLegacyObjects(ctx, api, eos.AN(viper.GetString("DAOContract")), eos.Name("proposal"))
 				if err == nil {
 					openProposals.Set(float64(len(proposals)))
-=======
-					voteEventCount.Set(float64(len(results)))
->>>>>>> Stashed changes
 				} else {
 					errorCount.Add(1)
 					log.Println("Retrieval error: an error querying legacy objects from "+viper.GetString("DAOContract")+" scope: proposal", err)
@@ -350,11 +338,7 @@ var serveCmd = &cobra.Command{
 				query.Limit = 1000
 				results, err := query.Results()
 				if err == nil {
-<<<<<<< Updated upstream
 					voteEventCount.Set(float64(len(results)))
-=======
-					daoEventCount.Set(float64(len(results)))
->>>>>>> Stashed changes
 				} else {
 					errorCount.Add(1)
 					log.Println("Error updating the vote count: ", err)

daoctl.yaml

@@ -11,12 +11,7 @@ HyperionEndpoint: https://telos.caleos.io
 BallotPrefix: hypha1.....
 RewardToken:
   Contract: token.hypha
-<<<<<<< Updated upstream
   Symbol: HYPHA
-=======
-
-BallotPrefix: hypha1....
->>>>>>> Stashed changes
 VoteTokenSymbol: HVOICE
 ServePort: 8085
 ScrapeInterval: 1m 

go.mod

@@ -31,4 +31,4 @@ require (
 
 replace github.com/hypha-dao/dao-contracts/dao-go => ../dao-contracts/dao-go
 
-replace github.com/hypha-dao/document-graph/docgraph => ../document-graph/docgraph
+replace github.com/hypha-dao/document-graph/docgraph => ../dao-contracts/document-graph/docgraph

views/payout.go

@@ -59,11 +59,7 @@ func PayoutTable(payouts []models.Payout) *simpletable.Table {
 			{Align: simpletable.AlignRight, Text: util.FormatAsset(&payouts[index].SeedsEscrow, 0)},
 			{Align: simpletable.AlignRight, Text: util.FormatAsset(&payouts[index].SeedsLiquid, 0)},
 			{Align: simpletable.AlignRight, Text: payouts[index].CreatedDate.Time.Format("2006 Jan 02")},
-<<<<<<< Updated upstream
 			{Align: simpletable.AlignRight, Text: string(payouts[index].BallotName)[9:]},
-=======
-			{Align: simpletable.AlignRight, Text: string(payouts[index].BallotName)[10:]},
->>>>>>> Stashed changes
 		}
 		table.Body.Cells = append(table.Body.Cells, r)
 	}