Eliminated an error

2010-01-16 17:55:02 +00:00 · 2010-01-16 17:55:02 +00:00 · 7e39fb0ad0
commit 7e39fb0ad0
parent 0bcb614d21
1 changed files with 0 additions and 1 deletions
--- a/tools/doc/Cantera.cfg.in
+++ b/tools/doc/Cantera.cfg.in
@ -669,7 +669,6 @@ FILE_PATTERNS          = Kinetics.h  Kinetics.cpp \
                         PDSS.h \
                         PDSS.cpp \
                         SpeciesThermo.h \
-<<<<<<< .working
                         NasaThermo.h \
                         NasaPoly1.h \
                         NasaPoly2.h \