Viewing all changes in revision 8002.1.3.
- Committer: Francis J. Lacoste
- Date: 2009-03-19 20:58:39 UTC
- mto: This revision was merged to the branch mainline in revision 8008.
- Revision ID: francis.lacoste@canonical.com-20090319205839-2knv6lekn9fcou4f
Add check for no conlict marker.
- files modified:
- Makefile
expand all
collapse all
added
removed
