HTCondor Project List Archives


[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Condor-devel] forgotten code merge

Peter,
  You've forgotten to do your code merge, probably for at least
this commit
  commit 69a32f2c8fb95fc7dd213398a71a276a6f0eb95a

Further, the merge causes a conflict.  You do not want me resolving
your conflict. . .you can be sure of that.

Now, you'll be doing my merge for me. . .thanks.
Karen