From 6a995e52ab6b1eccf8ea9bc0d308d5db934e32c0 Mon Sep 17 00:00:00 2001
From: Daniel Reeves <xdanielreeves@gmail.com>
Date: Mon, 6 Jan 2025 23:55:14 -0500
Subject: [PATCH] update readme

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 5474fdd..c1ac3a3 100644
--- a/README.md
+++ b/README.md
@@ -308,7 +308,6 @@ So when should you use `fwl`? The main use case is in OLTP systems (e.g. Postgre
 ## Setting method options globally
 
 Method options can be set globally via `vars`, e.g. in your `dbt_project.yml`. Each `method` gets its own config, e.g. the `dbt_linreg: method_options: chol: ...` namespace only applies to the `chol` method. Here is an example:
->>>>>>> 72d089e (update readme)
 
 ```yaml
 # dbt_project.yml