You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
tdesdk/cervisia/tests/resolvedlg-BR74903-test-01.txt

5 lines
71 B

123
<<<<<<< resolvedlg-BR74903-test-01.txt
conf=======
456>>>>>>> 1.2