[SCM] ci-tooling packaging branch, master, updated. 19eb2da66c24da542b8499e42537b7f41691b632

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=19eb2da

The following commit has been merged in the master branch:
commit 19eb2da66c24da542b8499e42537b7f41691b632
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Oct 16 12:55:51 2015 +0200

    make test slightly more useful by actually making png and svg trigger error
---
 test/data/test_lint_merge_marker/test_lint/image.png  | 3 +++
 test/data/test_lint_merge_marker/test_lint/image.svgz | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/test/data/test_lint_merge_marker/test_lint/image.png b/test/data/test_lint_merge_marker/test_lint/image.png
index e69de29..5965708 100644
--- a/test/data/test_lint_merge_marker/test_lint/image.png
+++ b/test/data/test_lint_merge_marker/test_lint/image.png
@@ -0,0 +1,3 @@
+<<<<<<< 
+<<<<<<< 
+<<<<<<< 
diff --git a/test/data/test_lint_merge_marker/test_lint/image.svgz b/test/data/test_lint_merge_marker/test_lint/image.svgz
index e69de29..5965708 100644
--- a/test/data/test_lint_merge_marker/test_lint/image.svgz
+++ b/test/data/test_lint_merge_marker/test_lint/image.svgz
@@ -0,0 +1,3 @@
+<<<<<<< 
+<<<<<<< 
+<<<<<<< 

-- 
ci-tooling packaging