]> asedeno.scripts.mit.edu Git - 1ts-debian.git/commit
projects / 1ts-debian.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9ce036a) | patch
Fix conflict marker
authorhartmans <hartmans@cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f>
Fri, 12 Jul 2002 00:28:36 +0000 (00:28 +0000)
committerhartmans <hartmans@cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f>
Fri, 12 Jul 2002 00:28:36 +0000 (00:28 +0000)
commitbe7a43487bf94c241b65a8ffc11838cfb4c0323a
treef584cd35bafda151939d5563a0f61b443138f046tree | snapshot
parent9ce036af8787e907ca51ccadc9ee6a96cff4141ecommit | diff
Fix conflict marker

git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@138 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f
lib/Makefile.in diff | blob | history
A git-svn clone of the now-gone svn://svn.1ts.org/debian