merge

diff --cc src/Dyna/Analysis/ANF.hs
index d927c69227c28cef81ab4c86a3846431102583fb,28611ca0aa086ff7b27c54766db1e93589363029..6821bdf0e83da5425973c80961e89dd4b3f832e1
--- 1/src/Dyna/Analysis/ANF.hs
--- 2/src/Dyna/Analysis/ANF.hs
+++ b/src/Dyna/Analysis/ANF.hs
@@@ -69,7 -69,7 +69,7 @@@
  {-# LANGUAGE OverloadedStrings #-}
  
  module Dyna.Analysis.ANF (
-     ANFState(..), NT(..), FDT, EVF, FDR(..),
 -    ANFState(..), NT(..), NTV, FDT, EVF, FDR, 
++    ANFState(..), NT(..), FDT, NTV, EVF, FDR(..),
      normTerm, normRule, runNormalize, printANF
  ) where