Viewing all changes in revision 8687.15.29.
- Committer: Karl Fogel
- Date: 2009-07-13 03:05:37 UTC
- mto: This revision was merged to the branch mainline in revision 8960.
- Revision ID: karl.fogel@canonical.com-20090713030537-vi8ftxw5c00nhxp0
Fix some problems:
- Restore the "[buildout]" thing in buildout.cfg (!). Thanks, Barry.
- Restore a comment to database/schema/Makefile
- Undo the spurious addition of a newline to the end of
lib/canonical/tests/test_no_conflict_marker.py (while adding the
newline is probably okay, and maybe even preferable, it shouldn't
be part of this branch).
- Restore the "[buildout]" thing in buildout.cfg (!). Thanks, Barry.
- Restore a comment to database/schema/Makefile
- Undo the spurious addition of a newline to the end of
lib/canonical/tests/test_no_conflict_marker.py (while adding the
newline is probably okay, and maybe even preferable, it shouldn't
be part of this branch).
expand all
collapse all
added
removed
