resolve upstream merge conflict in distclean

sjlombardo · sjlombardo · commit f03453b13d69 · 2022-10-05T16:28:37.000-04:00
diff --git a/Makefile.in b/Makefile.in
@@ -1531,7 +1531,7 @@ clean:
 	rm -f threadtest5
 
 distclean:	clean
-	rm -f config.h config.log config.status libtool Makefile sqlite3.pc \
+	rm -f sqlite_cfg.h config.log config.status libtool Makefile sqlite3.pc \
 		$(TESTPROGS)
 
 #

Original file line number	Diff line number	Diff line change
`@@ -1531,7 +1531,7 @@ clean:`
`1531`	`1531`	`rm -f threadtest5`
`1532`	`1532`
`1533`	`1533`	`distclean: clean`
`1534`		`- rm -f config.h config.log config.status libtool Makefile sqlite3.pc \`
	`1534`	`+ rm -f sqlite_cfg.h config.log config.status libtool Makefile sqlite3.pc \`
`1535`	`1535`	`$(TESTPROGS)`
`1536`	`1536`
`1537`	`1537`	`#`