fix some conflicts that for some reason weren't resolved during the last cherry-picks

[citadel.git] / citadel / svn_revision.h

const char *svn_revision(void);