fixing merge conflicts

PJ Hoberman · PJ Hoberman · commit 69469fe668dc · 2020-03-21T19:16:44.000-06:00
diff --git a/tests/test_app.py b/tests/test_app.py
@@ -25,6 +25,7 @@
         n_days=60
     )
 
+
 # set up
 
 # we just want to verify that st _attempted_ to render the right stuff

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`n_days=60`
`26`	`26`	`)`
`27`	`27`
	`28`	`+`
`28`	`29`	`# set up`
`29`	`30`
`30`	`31`	`# we just want to verify that st _attempted_ to render the right stuff`