Project

General

Profile

« Previous | Next » 

Revision 45c4528a

Added by danij over 11 years ago

Fix merge error

Grr. Resolved means resolved. Not "please leave conflict resolution
markup in the source files and allow me to commit regardless"...

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

View differences