Resolve conflict test

[?]
Jan 12, 2021, 1:43 AM
HRFQVINEPB3ODNOUFKVWOQWBTACCCRUJ7T6FHCJRMO3UFORQMRKQC

Dependencies

Change contents

  • edit in test5.txt at line 7
    [4.9][2.0:9](),[4.9][2.0:9]()
    New line
  • replacement in test5.txt at line 8
    [3.9][3.9:19]()
    New change
    [3.9]
    New line