From 1670612b907f7c76d852f817cf9513465049cbc2 Mon Sep 17 00:00:00 2001
From: "Dr.Lt.Data" <dr.lt.data@gmail.com>
Date: Tue, 24 Sep 2024 21:25:16 +0900
Subject: [PATCH] resolve conflict

---
 extra_model_paths.yaml.example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extra_model_paths.yaml.example b/extra_model_paths.yaml.example
index 8519341c..eb537a86 100644
--- a/extra_model_paths.yaml.example
+++ b/extra_model_paths.yaml.example
@@ -41,7 +41,6 @@ a111:
 #     loras: models/loras/
 #     photomaker: models/photomaker/
 #     style_models: models/style_models/
-#     diffusion_models: models/diffusion_models/
 #     upscale_models: models/upscale_models/
 #     vae: models/vae/
 #     vae_approx: models/vae_approx/