Merge pull request #22 from rushhiii/main8

rushhiii · web-flow · commit 169556500d67 · 2025-06-22T15:29:26.000-04:00
fix syntax
diff --git a/Toyota Widget/MyToyota.js b/Toyota Widget/MyToyota.js
@@ -98,6 +98,7 @@ function addDetailBlock(stack, label, value) {
 
   const val = block.addText(value.toString())
   val.font = Font.boldSystemFont(14)
+<<<<<<< Updated upstream
   val.textColor = textColor
 }
 
@@ -115,3 +116,7 @@ function buildCompactWidget(widget) {
   addDetailText(widget, "Fuel", carInfo.fuel)
   addDetailText(widget, "Status", carInfo.status)
 }
+=======
+  val.textColor = textColor;
+}
+>>>>>>> Stashed changes

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ function addDetailBlock(stack, label, value) {`
`98`	`98`
`99`	`99`	`const val = block.addText(value.toString())`
`100`	`100`	`val.font = Font.boldSystemFont(14)`
	`101`	`+<<<<<<< Updated upstream`
`101`	`102`	`val.textColor = textColor`
`102`	`103`	`}`
`103`	`104`
`@@ -115,3 +116,7 @@ function buildCompactWidget(widget) {`
`115`	`116`	`addDetailText(widget, "Fuel", carInfo.fuel)`
`116`	`117`	`addDetailText(widget, "Status", carInfo.status)`
`117`	`118`	`}`
	`119`	`+=======`
	`120`	`+ val.textColor = textColor;`
	`121`	`+}`
	`122`	`+>>>>>>> Stashed changes`