]> err.no Git - systemd/commit
projects / systemd / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 860ce4a) | patch
Fix up mismerge 17-1
authorTollef Fog Heen <tfheen@err.no>
Wed, 16 Feb 2011 20:14:49 +0000 (21:14 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 16 Feb 2011 20:14:49 +0000 (21:14 +0100)
commitc7b3ac9cfdddd494fd48196bbd0219b065afdcd4
tree23a8f706cb391ceb4064978305b5b5a2c9fb2c82tree | snapshot
parent860ce4af64d9c59d1cb75641f7417dcdb3bb15c0commit | diff
Fix up mismerge

Some bits of the serial-getty@.service.m4 didn't get merged
correctly.  Fix that.
units/serial-getty@.service.m4 diff | blob | history
systemd, git://git.err.no/systemd