merge

Signed-off-by: zehao-intel <[email protected]>
intel · Feb 2, 2024 · 0beb125 · 0beb125
2 parents a4a80fd + 86fa8ff
commit 0beb125
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/test/3x/tensorflow/keras/requirements.txt b/test/3x/tensorflow/keras/requirements.txt
@@ -1,6 +1,18 @@
+<<<<<<< HEAD
 intel-extension-for-tensorflow[cpu]
 prettytable
 py-cpuinfo
 prettytable
 psutil
 pkg_resources
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> 0219c55059a59365e1ebef34486799d9b2dbdccb
+intel-extension-for-tensorflow[cpu]
+pkg_resources
+prettytable
+prettytable
+psutil
+py-cpuinfo
+>>>>>>> 86fa8ff37929810f251d2e35db88c143410b160f
diff --git a/test/3x/tensorflow/requirements.txt b/test/3x/tensorflow/requirements.txt
@@ -1,6 +1,18 @@
+<<<<<<< HEAD
 prettytable
 py-cpuinfo
 pytest
 prettytable
 psutil
 pkg_resources
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> 0219c55059a59365e1ebef34486799d9b2dbdccb
+pkg_resources
+prettytable
+prettytable
+psutil
+py-cpuinfo
+pytest
+>>>>>>> 86fa8ff37929810f251d2e35db88c143410b160f