diff options
| author | toma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-11-25 17:56:58 +0000 |
|---|---|---|
| committer | toma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-11-25 17:56:58 +0000 |
| commit | bd9e6617827818fd043452c08c606f07b78014a0 (patch) | |
| tree | 425bb4c3168f9c02f10150f235d2cb998dcc6108 /cervisia/tests/resolvedlg-BR74903-test-01.txt | |
| download | tdesdk-bd9e6617827818fd043452c08c606f07b78014a0.tar.gz tdesdk-bd9e6617827818fd043452c08c606f07b78014a0.zip | |
Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.
BUG:215923
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'cervisia/tests/resolvedlg-BR74903-test-01.txt')
| -rw-r--r-- | cervisia/tests/resolvedlg-BR74903-test-01.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cervisia/tests/resolvedlg-BR74903-test-01.txt b/cervisia/tests/resolvedlg-BR74903-test-01.txt new file mode 100644 index 00000000..c4b8a22f --- /dev/null +++ b/cervisia/tests/resolvedlg-BR74903-test-01.txt @@ -0,0 +1,4 @@ +123 +<<<<<<< resolvedlg-BR74903-test-01.txt +conf======= +456>>>>>>> 1.2 |