summaryrefslogtreecommitdiff
path: root/oox/prj
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-18 14:12:16 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-18 14:12:16 +0200
commit6e135ba19ae197fa6b1ca65034ad3dc8876a6be0 (patch)
treea33121f11b40eab2724736c768b487cfc3811913 /oox/prj
parent96d563c01bcb8d5126a447276d04058075dd25ea (diff)
fixing rebase errors
Diffstat (limited to 'oox/prj')
-rw-r--r--oox/prj/d.lst1
1 files changed, 0 insertions, 1 deletions
diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index 8b137891791f..e69de29bb2d1 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -1 +0,0 @@
-