Changes between Version 2 and Version 3 of SvnVersionConflict


Ignore:
Timestamp:
07/10/13 12:53:53 (12 years ago)
Author:
trac
Comment:

—

Legend:

Unmodified
Added
Removed
Modified

  • SvnVersionConflict

    v2 v3  
    2424
    2525The users will have to decide how to resolve the conflict, either by integrating the code themselves or by replacing the hybrid {{{file_name}}} with one of the "pure" copies, otherwise the code will almost certainly not compile.
     26