Commit 686fc9cb authored by iv's avatar iv

NayuOS: Fix merge error

parent 492a51d3
...@@ -9,7 +9,7 @@ parts += ...@@ -9,7 +9,7 @@ parts +=
template-instance template-instance
[versions] [versions]
slapos.recipe.template = 2.9 slapos.recipe.template = 3.0
[template-instance] [template-instance]
# create the instance.cfg file in the buildout directory # create the instance.cfg file in the buildout directory
......
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