← Back to branch summary

~gryle-devel/gryle/trunk-deleted

« back to all changes in this revision

Viewing changes to .bzrignore

  • Committer: Chris Lamb
  • Date: 2007-01-13 23:51:14 UTC
  • mfrom: (14 gryle)
  • mto: (1.2.18 gryle)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: chris@chris-lamb.co.uk-20070113235114-q7e3ktyjywvobamf
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
.bzrignore
1
1
.classpath
2
2
.project
3
3
bin
 
4
<<<<<<< TREE
4
5
javadoc
5
6
dist
 
7
=======
 
8
cruft
 
9
>>>>>>> MERGE-SOURCE