# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1270047771 -7200
# Node ID eaec839ad3fefec260e6a7856f5e77f9a861396a
# Parent  a63d7886fcf528ea2836761e0f11537036c39e88
fix bad merge

diff -r a63d7886fcf5 -r eaec839ad3fe __pkginfo__.py
--- a/__pkginfo__.py	Wed Mar 31 15:39:09 2010 +0200
+++ b/__pkginfo__.py	Wed Mar 31 17:02:51 2010 +0200
@@ -95,9 +95,9 @@
          [join(_data_dir, fname) for fname in listdir(_data_dir)
           if not isdir(join(_data_dir, fname))]],
         [join('share', 'cubicweb', 'cubes', 'shared', 'data', 'timeline'),
-         [join(data_dir, 'timeline', fname) for fname in listdir(join(data_dir, 'timeline'))]],
+         [join(_data_dir, 'timeline', fname) for fname in listdir(join(_data_dir, 'timeline'))]],
         [join('share', 'cubicweb', 'cubes', 'shared', 'data', 'images'),
-         [join(data_dir, 'images', fname) for fname in listdir(join(data_dir, 'images'))]],
+         [join(_data_dir, 'images', fname) for fname in listdir(join(_data_dir, 'images'))]],
         [join('share', 'cubicweb', 'cubes', 'shared', 'wdoc'),
          [join(_wdoc_dir, fname) for fname in listdir(_wdoc_dir)
           if not isdir(join(_wdoc_dir, fname))]],