Commita1666eb

committed

merged conflicts

2 parentsbfee4f3 +1482954 commita1666ebCopy full SHA for a1666eb

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl`
`9`	`9`	`liberapay:# Replace with a single Liberapay username`
`10`	`10`	`issuehunt:# Replace with a single IssueHunt username`
`11`	`11`	`otechie:# Replace with a single Otechie username`
`12`		`-custom:['0xA87258F829Fb6b5622d60896dC010cdF57e1DCE6']`
	`12`	`+custom:['0xD9D6E8C16686536E3C81124639e975AdF2468197']`

Comments

(0)