fix slapos.cfg parse error

bc904475 · Alain Takoudjou · f3af63f0 · bc904475
Commit bc904475 authored Oct 01, 2015 by Alain Takoudjou
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

stack/slapos.cfg stack/slapos.cfg +0 -6

No files found.
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -168,14 +168,8 @@ cliff = 1.15.0
 enum34 = 1.0.4

 # Required by:
-<<<<<<< HEAD
 # jsonschema==2.5.1
 functools32 = 3.2.3.post2
-=======
-# cliff==1.9.0
-# stevedore==1.1.0
-pbr = 0.10.4
->>>>>>> 303ce29... Install pbr egg before installing cliff egg.

 # Required by:
 # cryptography==1.0.2