From b7a36117b4b32b59de205b39f30398ab83354dba Mon Sep 17 00:00:00 2001
From: MarcusLoppe <marcusloren1993@gmail.com>
Date: Mon, 17 Jun 2024 17:12:11 +0200
Subject: [PATCH] bug fix

---
 meshgpt_pytorch/trainer.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/meshgpt_pytorch/trainer.py b/meshgpt_pytorch/trainer.py
index 785a62c..4aba978 100644
--- a/meshgpt_pytorch/trainer.py
+++ b/meshgpt_pytorch/trainer.py
@@ -143,16 +143,13 @@ def __init__(
                 drop_last = True,
                 collate_fn = partial(custom_collate, pad_id = model.pad_id)
             )
-
-<<<<<<< HEAD
-        self.data_kwargs = data_kwargs
-=======
+            
         if hasattr(dataset, 'data_kwargs') and exists(dataset.data_kwargs):
             assert beartype_isinstance(dataset.data_kwargs, List[str])
             self.data_kwargs = dataset.data_kwargs
         else:
             self.data_kwargs = data_kwargs
->>>>>>> upstream/main
+ 
 
         (
             self.model,
@@ -506,16 +503,12 @@ def __init__(
                 drop_last = True,
                 collate_fn = partial(custom_collate, pad_id = model.pad_id)
             )
-
-<<<<<<< HEAD
-        self.data_kwargs = data_kwargs
-=======
+ 
         if hasattr(dataset, 'data_kwargs') and exists(dataset.data_kwargs):
             assert beartype_isinstance(dataset.data_kwargs, List[str])
             self.data_kwargs = dataset.data_kwargs
         else:
             self.data_kwargs = data_kwargs
->>>>>>> upstream/main
 
         (
             self.model,