diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2019-01-24 15:59:33 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2019-01-24 15:59:33 +0000 |
| commit | c6bb7c448e2bbc45b1631234fee70b11a7dd6a24 (patch) | |
| tree | f566acd29a783250b10e9d3a53968e9b68dcfd3b /sbin | |
| parent | f7ba6d56f2549cb293706aae8a7276cf0b7acb38 (diff) | |
fix shift/reduce conflict
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/unwind/uw_parse.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/unwind/uw_parse.y b/sbin/unwind/uw_parse.y index 6f24bbad45a..000c6888481 100644 --- a/sbin/unwind/uw_parse.y +++ b/sbin/unwind/uw_parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: uw_parse.y,v 1.1 2019/01/23 13:11:00 florian Exp $ */ +/* $OpenBSD: uw_parse.y,v 1.2 2019/01/24 15:59:32 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -190,11 +190,11 @@ nl : '\n' optnl /* one or more newlines */ unwind_forwarder : FORWARDER forwarder_block ; -forwarder_block : '{' optnl forwarderopts_l optnl '}' +forwarder_block : '{' optnl forwarderopts_l '}' | forwarderoptsl ; -forwarderopts_l : forwarderopts_l forwarderoptsl optnl +forwarderopts_l : forwarderopts_l forwarderoptsl nl | forwarderoptsl optnl forwarderoptsl : STRING { |