summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-01-03 11:39:02 +0100
committerSoren Hansen <soren@linux2go.dk>2011-01-03 11:39:02 +0100
commit2b26cbfd8dc5f03026dfb03eef9cd3a443edab86 (patch)
treebcef63d7754e4226c151892920daef29aef95be7 /bin
parentc6736ab21a789830d76588333242b63979abc65c (diff)
downloadnova-2b26cbfd8dc5f03026dfb03eef9cd3a443edab86.tar.gz
nova-2b26cbfd8dc5f03026dfb03eef9cd3a443edab86.tar.xz
nova-2b26cbfd8dc5f03026dfb03eef9cd3a443edab86.zip
Fix a merge artifact.
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions