/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

  • Committer: John Arbash Meinel
  • Date: 2009-05-01 18:09:24 UTC
  • Revision ID: john@arbash-meinel.com-20090501180924-bco4vmhymopg5lls
Different sides deleting different amounts is now a conflict.

This is because the final 'lines' are different, but something occurred
on each side.
Filename Latest Rev Last Changed Committer Comment Size
..
Makefile 2691.1.12 18 years ago Ian Clatworthy Added Quick Start Summary 347 bytes Diff Download File
quick-start-summary.pdf 3091.1.1 17 years ago Ian Clatworthy Better PDF for Qiock Start Card (Ian Clatworthy) 400 KB Diff Download File
quick-start-summary.png 3066.4.1 17 years ago Ian Clatworthy Rename Quick Start Guide to Quick Start Card 642 KB Diff Download File
quick-start-summary.svg 3066.4.1 17 years ago Ian Clatworthy Rename Quick Start Guide to Quick Start Card 81.1 KB Diff Download File