diff options
author | David Roundy <droundy@darcs.net> | 2007-06-29 22:16:36 +0200 |
---|---|---|
committer | David Roundy <droundy@darcs.net> | 2007-06-29 22:16:36 +0200 |
commit | d804d114ade5ab048d185b4a72f81a1f525597c5 (patch) | |
tree | 1239b473879e2e1a2546dc6790a53ed0936a3b34 /scripts/xinitrc | |
parent | 70f204213b397a0fccfaea287420f032cb7e4e19 (diff) | |
download | XMonadContrib-d804d114ade5ab048d185b4a72f81a1f525597c5.tar.gz XMonadContrib-d804d114ade5ab048d185b4a72f81a1f525597c5.tar.xz XMonadContrib-d804d114ade5ab048d185b4a72f81a1f525597c5.zip |
resolve conflict in Square.
darcs-hash:20070629201636-72aca-3e3b62e6350b19f2dfb2dbf3442d4a68c4da077f.gz
Diffstat (limited to 'scripts/xinitrc')
0 files changed, 0 insertions, 0 deletions