Commit 027cb928 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Fix merge error.

parent e53e73ad
......@@ -914,7 +914,6 @@ function (_, Constraints, sup, ppstart, JacksEditor, wt,
>>>>>>> Reformulate instantiate page into a template. Rework the step container
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment