Skip to content

S
slapos.package
Commit 67362008 authored by Kristopher Ruzic's avatar Kristopher Ruzic
Browse files
Options

oops, remove diff lines

parent 7cb9b954
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
playbook/wendelin-standalone.yml
View file @ 67362008
...@@ -4,12 +4,9 @@ ...@@ -4,12 +4,9 @@
vars: vars:
software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/1.0.3/software/wendelin/software.cfg software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/1.0.3/software/wendelin/software.cfg
<<<<<<< HEAD
startup_playbook_id: wendelin-standalone.yml startup_playbook_id: wendelin-standalone.yml
playbook_name: wendelin playbook_name: wendelin
request_instance_template: request-wendelin.j2 request_instance_template: request-wendelin.j2
=======
>>>>>>> 754c2b4af77d43544ff5cb4112b6afc9875ea535
roles: roles:
- standalone-shared - standalone-shared
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7