fixed a merge conflict

instructlab · Sep 18, 2024 · 99ae37f · 99ae37f
1 parent 0964a73
commit 99ae37f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/instructlab/training/config.py b/src/instructlab/training/config.py
@@ -50,14 +50,10 @@ class DataProcessArgs(BaseModel):
     max_seq_len: int  # defines the max sequence length of a sample
     model_path: str  # either a HF model name or path to HF model
     chat_tmpl_path: str
-<<<<<<< HEAD
     num_cpu_procs: int = Field(
         default=16,
         description="this is the number of CPU procs we use for data processing parallelization",
     )
-=======
-    num_parallel_procs: int
->>>>>>> 8602d22 (increased performance of data process and made a flag for the number of parallel processes)
 
     # disable the protected namespace for the model_config field
     model_config = ConfigDict(protected_namespaces=())