From 838aae1761a344bb80afda89a032bad00d861fb2 Mon Sep 17 00:00:00 2001
From: Wing Lian <wing@axolotl.ai>
Date: Tue, 17 Dec 2024 16:45:19 -0500
Subject: [PATCH] chore: lint - merge conflict

---
 tests/e2e/test_llama.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/e2e/test_llama.py b/tests/e2e/test_llama.py
index c7d000744..1ce9d60b9 100644
--- a/tests/e2e/test_llama.py
+++ b/tests/e2e/test_llama.py
@@ -105,7 +105,6 @@ def test_fix_untrained_tokens(self, temp_dir):
         train(cfg=cfg, cli_args=cli_args, dataset_meta=dataset_meta)
         assert (Path(temp_dir) / "model.safetensors").exists()
 
-
     def test_batch_flattening(self, temp_dir):
         # pylint: disable=duplicate-code
         cfg = DictDefault(