diff --git a/tools/doc/Cantera.cfg.in b/tools/doc/Cantera.cfg.in
index 7631a0397..a4d4c9397 100755
--- 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 \