From bb830558d13a8090988141c90ed49b16895c944a Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 25 Jun 2013 18:25:27 -0700
Subject: librustc: Fix merge fallout and test cases.

---
 src/libsyntax/parse/token.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libsyntax/parse')

diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 18e6c181799..793626f0e18 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -563,7 +563,7 @@ pub mod keywords {
         // Strict keywords
         As,
         Break,
-        Freeze,
+        Const,
         Copy,
         Do,
         Else,
-- 
cgit 1.4.1-3-g733a5