From 7e39fb0ad05abad8679ec57f89e2a7608502d099 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sat, 16 Jan 2010 17:55:02 +0000 Subject: [PATCH] Eliminated an error --- tools/doc/Cantera.cfg.in | 1 - 1 file changed, 1 deletion(-) 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 \