From a30b5ebbbcc4af0b82894edf4e026d4aea25bd95 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 4 May 2010 11:02:15 +0200 Subject: Restore file deleted during merge conflict resolution Reviewed-by: Trust Me --- tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir diff --git a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir new file mode 100644 index 0000000..98d6b74 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir @@ -0,0 +1,2 @@ +Foo 1.1 Foo.qml +Foo 1.0 Foo.qml -- cgit v0.12