[Adium-devl] Problems With Storing Info. for Contact

[Peter Hosey]

On Jun 06, 2008, at 05:48:32, George Armah wrote:
> C      Resources/MainMenu.nib/info.nib
> C      Resources/MainMenu.nib/keyedobjects.nib
> C      Resources/MainMenu.nib/classes.nib

Conflicts = breakage. You need to either resolve those yourself  
(<sarcasm>fun!</sarcasm>) or revert them and re-do whatever changes  
you made.