oops, remove diff lines

67362008 · Kristopher Ruzic · 7cb9b954 · 67362008
Commit 67362008 authored Jul 02, 2015 by Kristopher Ruzic
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

playbook/wendelin-standalone.yml playbook/wendelin-standalone.yml +0 -3

No files found.
--- a/playbook/wendelin-standalone.yml
+++ b/playbook/wendelin-standalone.yml
@@ -4,12 +4,9 @@

  vars:
    software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/1.0.3/software/wendelin/software.cfg
-<<<<<<< HEAD
    startup_playbook_id: wendelin-standalone.yml
    playbook_name: wendelin
    request_instance_template: request-wendelin.j2
-=======
->>>>>>> 754c2b4af77d43544ff5cb4112b6afc9875ea535

  roles:
    - standalone-shared