Yum Updates: Cobbler

[Dan Thurman]

During the Yum updates of cobbler, I got:

  Updating       : cobbler                                       [329/789]
Traceback (most recent call last):
  File "/usr/bin/cobbler", line 17, in <module>
    import cobbler.cobbler as app
  File "/usr/lib/python2.5/site-packages/cobbler/cobbler.py", line 26, 
in <module>
    import api
  File "/usr/lib/python2.5/site-packages/cobbler/api.py", line 207
    <<<<<<< HEAD:cobbler/api.py
     ^
SyntaxError: invalid syntax
Stopping cobbler daemon: [  OK  ]
Starting cobbler daemon: Traceback (most recent call last):
  File "/usr/bin/cobblerd", line 19, in <module>
    import cobbler.api as bootapi
  File "/usr/lib/python2.5/site-packages/cobbler/api.py", line 207
    <<<<<<< HEAD:cobbler/api.py
     ^
SyntaxError: invalid syntax
[FAILED]
error: %post(cobbler-1.2.0-1.fc9.noarch) scriptlet failed, exit status 1