From e90bf1785f89838898ee564268a4b3c613f19b44 Mon Sep 17 00:00:00 2001
From: priyakasimbeg <priyakasimbeg@users.noreply.github.com>
Date: Wed, 22 Nov 2023 23:49:20 +0000
Subject: [PATCH] merge

---
 algorithmic_efficiency/workloads/workloads.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/algorithmic_efficiency/workloads/workloads.py b/algorithmic_efficiency/workloads/workloads.py
index 617316f4a..a972700d3 100644
--- a/algorithmic_efficiency/workloads/workloads.py
+++ b/algorithmic_efficiency/workloads/workloads.py
@@ -24,13 +24,10 @@
         'workload_path': 'criteo1tb/criteo1tb',
         'workload_class_name': 'Criteo1TbDlrmSmallLayerNormWorkload'
     },
-<<<<<<< HEAD
-=======
     'criteo1tb_embed_init': {
         'workload_path': 'criteo1tb/criteo1tb',
         'workload_class_name': 'Criteo1TbDlrmSmallEmbeddingInitWorkload'
     },
->>>>>>> criteo_workload_variants
     'criteo1tb_resnet': {
         'workload_path': 'criteo1tb/criteo1tb',
         'workload_class_name': 'Criteo1TbDlrmSmallResNetWorkload'