diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-05 14:27:38 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-05 14:27:38 +0200 |
| commit | af983b843d1335917f4a702cea6d91d28bab68e9 (patch) | |
| tree | 692e6e4090ef282b597b9b69d2abd53262cf47a0 /tests/data/testimage.png | |
| parent | 554b1990e23c76aea182e9b8c2687f8f8b939fb9 (diff) | |
| parent | 0fce89308e2fbcb44a2091ca67f373ba89ee068e (diff) | |
| download | nextcloud-server-af983b843d1335917f4a702cea6d91d28bab68e9.tar.gz nextcloud-server-af983b843d1335917f4a702cea6d91d28bab68e9.zip | |
fix merge conflicts
Diffstat (limited to 'tests/data/testimage.png')
| -rw-r--r-- | tests/data/testimage.png | bin | 0 -> 3670 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/data/testimage.png b/tests/data/testimage.png Binary files differnew file mode 100644 index 00000000000..257598f04f5 --- /dev/null +++ b/tests/data/testimage.png |