From: adam <adam@megacz.com>
Date: Wed, 28 Feb 2007 10:42:40 +0000 (+0100)
Subject: resolve conflict
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=bf2d5ebe12d965d885fabce177149222c13308da;p=fleet.git

resolve conflict
---

bf2d5ebe12d965d885fabce177149222c13308da
diff --cc src/edu/berkeley/fleet/assembler/Parser.java
index 39deda3,39deda3..e145019
--- a/src/edu/berkeley/fleet/assembler/Parser.java
+++ b/src/edu/berkeley/fleet/assembler/Parser.java
@@@ -47,10 -47,10 +47,6 @@@ public class Parser 
          return grammar;
      }
  
--    Tree<String> parse(Reader r) throws Exception {
--        return new CharParser(getGrammar()).parse(new CharInput(r)).expand1();
--    }
--
      public void parse(Reader r, OutputStream out) throws Exception {
  
          // this needs to be "code bag zero"