From a4d4a5549684d4b454e4d1acdcaad89d230bb699 Mon Sep 17 00:00:00 2001
From: Karel Klic <kklic@redhat.com>
Date: Thu, 4 Feb 2010 16:07:11 +0100
Subject: Removed 4 shift/reduce conflicts

---
 src/Backtrace/parser.y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Backtrace/parser.y b/src/Backtrace/parser.y
index 19032829..c87bfa9a 100644
--- a/src/Backtrace/parser.y
+++ b/src/Backtrace/parser.y
@@ -147,8 +147,8 @@ thread    : keyword_thread wss digit_sequence wsa '(' keyword_thread wss digit_s
               }
 ;
 
-frames    : frame            { $$ = $1; }
-          | frames wsa frame { $$ = frame_add_sibling($1, $3); }
+frames    : frame        { $$ = $1; }
+          | frames frame { $$ = frame_add_sibling($1, $2); }
 ;
 
 frame : frame_head_1 wss variables %dprec 3
-- 
cgit