remove conflict in pending_ident function and field name
authorDave Mitchell <davem@fdisolutions.com>
Tue, 2 Jan 2007 14:02:40 +0000 (14:02 +0000)
committerDave Mitchell <davem@fdisolutions.com>
Tue, 2 Jan 2007 14:02:40 +0000 (14:02 +0000)
commit3cbf51f5dd92d5c86babf20d1ad8e9b61b55793d
treea2d19de3a2abbfb95655dddcce3f131b8ac29e41
parentc52ab9a39ec1368602e437fee1313e341757bb0d
remove conflict in pending_ident function and field name

p4raw-id: //depot/perl@29660
embed.fnc
embed.h
proto.h
toke.c