testing undomerge

jpukin · jpukin · commit 52901f990af8 · 2020-09-15T15:57:31.000-04:00
diff --git a/styleFile.js b/styleFile.js
@@ -9,5 +9,5 @@ module.exports = {
 	accentColor: 'red', // accepted values include ['red', 'blue', 'white', 'green', etc.]
 
 	// setting to determine whether app dynamically adjusts to screen resizing; setting to false may improve performance
-	appResize: false, // acepted values include [true, false]
+	appResize: true, // acepted values include [true, false]
 }

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ module.exports = {`
`9`	`9`	`accentColor: 'red', // accepted values include ['red', 'blue', 'white', 'green', etc.]`
`10`	`10`
`11`	`11`	`// setting to determine whether app dynamically adjusts to screen resizing; setting to false may improve performance`
`12`		`- appResize: false, // acepted values include [true, false]`
	`12`	`+ appResize: true, // acepted values include [true, false]`
`13`	`13`	`}`