From 7dfaba2954ff59d83e98884542cf1aca4c8f4d31 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Sun, 13 Jul 2014 18:10:32 -0700
Subject: [PATCH] Fix conflict manager spec

---
 spec/compiler/build_tables/conflict_manager_spec.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/compiler/build_tables/conflict_manager_spec.cc b/spec/compiler/build_tables/conflict_manager_spec.cc
index 5e5886b2..18519e11 100644
--- a/spec/compiler/build_tables/conflict_manager_spec.cc
+++ b/spec/compiler/build_tables/conflict_manager_spec.cc
@@ -154,12 +154,12 @@ describe("resolving parse conflicts", []() {
                     it("records a conflict", [&]() {
                         manager->resolve_parse_action(rules::ERROR(), reduce, shift);
                         AssertThat(manager->conflicts()[0], Equals(
-                            Conflict("rule1: shift (precedence 0) / reduce ERROR (precedence 0)")
+                            Conflict("ERROR: shift (precedence 0) / reduce rule2 (precedence 0)")
                         ));
 
                         manager->resolve_parse_action(rules::END_OF_INPUT(), reduce, shift);
                         AssertThat(manager->conflicts()[1], Equals(
-                            Conflict("rule1: shift (precedence 0) / reduce EOF (precedence 0)")
+                            Conflict("END_OF_INPUT: shift (precedence 0) / reduce rule2 (precedence 0)")
                         ));
                     });
                 });