fix merge errors
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 20 May 2011 08:36:52 +0000 (11:36 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 20 May 2011 08:36:52 +0000 (11:36 +0300)
commit73acbc6b397506251f687e87e4d924789395c8bb
treeae96f698961b0644777cc9c8a8ab1495c247719d
parentb398a73cffb10c05e2374db561ed896bdd8e0603
fix merge errors
src/signond/signonidentityinfo.h