text conflict issue fix

5tarlight · 5tarlight · commit ad3701b74196 · 2021-10-31T00:16:29.000+09:00
diff --git a/src/pages/StatGraph.tsx b/src/pages/StatGraph.tsx
@@ -12,7 +12,7 @@ const StatGraph: FC = () => {
   const keys = Object.keys(storedStat)
   const data = keys.map((k, i) => {
     return {
-      name: k.length > 5 ? k.slice(0, 4) + '...' : k,
+      name: k.split(' ').length > 1 ? k.split(' ')[k.split(' ').length - 1] : k,
       value: Math.floor(storedStat[k].value * 10) / 10,
     }
   })

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ const StatGraph: FC = () => {`
`12`	`12`	`const keys = Object.keys(storedStat)`
`13`	`13`	`const data = keys.map((k, i) => {`
`14`	`14`	`return {`
`15`		`- name: k.length > 5 ? k.slice(0, 4) + '...' : k,`
	`15`	`+ name: k.split(' ').length > 1 ? k.split(' ')[k.split(' ').length - 1] : k,`
`16`	`16`	`value: Math.floor(storedStat[k].value * 10) / 10,`
`17`	`17`	`}`
`18`	`18`	`})`