merge

Signed-off-by: zehao-intel <[email protected]>
intel · Feb 2, 2024 · 10d680a · 10d680a
2 parents 59a0c23 + 0219c55
commit 10d680a
Show file tree

Hide file tree

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