[Tokyodebian-commits] Tokyo area Debian meeting resources.: Changes to 'master'

[Junichi Uekawa]

 debianmeetingresume200706.tex |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 4fe26a1a8f599e0787cd01c6ca4027c7c36f33b4
Merge: cba38a513cf209a8fd654179789d26a2e5d26b41 8e0f68eb3a9c8f0edb93503f24c9f5610aae67b6
Author: Junichi Uekawa <dancer at coreduo.netfort.gr.jp>
Date:   Sat Jun 23 21:48:33 2007 +0900

    fix conflict

commit cba38a513cf209a8fd654179789d26a2e5d26b41
Author: Junichi Uekawa <dancer at coreduo.netfort.gr.jp>
Date:   Sat Jun 23 21:47:49 2007 +0900

    resolve conflict generated by yabuki