fix(webapp): fix merge conflict

xavier506 · xavier506 · commit 9f59bc44d6ff · 2022-09-14T09:42:23.000-06:00
diff --git a/webapp/src/components/Card/index.js b/webapp/src/components/Card/index.js
@@ -77,6 +77,7 @@ const CardData = ({
         parseFloat(formatNumber(info.total_community || 0, 1)),
         parseFloat(formatNumber(info.total_development || 0, 1)),
         parseFloat(formatNumber(info.total_transparency || 0, 1)),
+        parseFloat(formatNumber(info.total_infrastructure || 0, 1)),
         parseFloat(formatNumber(info.total_trustiness || 0, 1))
       ]
     }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ const CardData = ({`
`77`	`77`	`parseFloat(formatNumber(info.total_community \|\| 0, 1)),`
`78`	`78`	`parseFloat(formatNumber(info.total_development \|\| 0, 1)),`
`79`	`79`	`parseFloat(formatNumber(info.total_transparency \|\| 0, 1)),`
	`80`	`+ parseFloat(formatNumber(info.total_infrastructure \|\| 0, 1)),`
`80`	`81`	`parseFloat(formatNumber(info.total_trustiness \|\| 0, 1))`
`81`	`82`	`]`
`82`	`83`	`}`