Permalink
Browse files

Resolve merge conflict caused by accidental checkin of wrong initiali…

…zers.generated file
  • Loading branch information...
2 parents b017689 + b3efe76 commit e83501aac4f846c4a12ef7ad6fbf324dd794328c Orion Edwards [GGL] committed Jan 6, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit e83501a

Please sign in to comment.