Fixing conflict

cecton · cecton · commit 66fd4bca059c · 2020-03-20T16:29:08.000+01:00
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
@@ -1015,7 +1015,6 @@ ServiceBuilder<
 				)
 					.const_label("name", config.impl_name)
 					.const_label("version", config.impl_version)
-					.const_label("commit", config.impl_commit),
 			)?, &registry)?.set(1);
 			register(Gauge::<U64>::new(
 				"node_roles", "The roles the node is running as",

Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,6 @@ ServiceBuilder<`
`1015`	`1015`	`)`
`1016`	`1016`	`.const_label("name", config.impl_name)`
`1017`	`1017`	`.const_label("version", config.impl_version)`
`1018`		`- .const_label("commit", config.impl_commit),`
`1019`	`1018`	`)?, &registry)?.set(1);`
`1020`	`1019`	`register(Gauge::<U64>::new(`
`1021`	`1020`	`"node_roles", "The roles the node is running as",`