From 86fa8ff37929810f251d2e35db88c143410b160f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 06:05:19 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- test/3x/tensorflow/keras/requirements.txt | 10 +++++----- test/3x/tensorflow/requirements.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/3x/tensorflow/keras/requirements.txt b/test/3x/tensorflow/keras/requirements.txt index 72845588fbc..86366af06d1 100644 --- a/test/3x/tensorflow/keras/requirements.txt +++ b/test/3x/tensorflow/keras/requirements.txt @@ -1,9 +1,9 @@ +<<<<<<< HEAD +======= +>>>>>>> 0219c55059a59365e1ebef34486799d9b2dbdccb intel-extension-for-tensorflow[cpu] +pkg_resources prettytable -py-cpuinfo -<<<<<<< HEAD prettytable psutil -pkg_resources -======= ->>>>>>> 0219c55059a59365e1ebef34486799d9b2dbdccb +py-cpuinfo diff --git a/test/3x/tensorflow/requirements.txt b/test/3x/tensorflow/requirements.txt index 47e7ca0c385..25aa21c03e6 100644 --- a/test/3x/tensorflow/requirements.txt +++ b/test/3x/tensorflow/requirements.txt @@ -1,9 +1,9 @@ -prettytable -py-cpuinfo -pytest <<<<<<< HEAD -prettytable -psutil -pkg_resources ======= >>>>>>> 0219c55059a59365e1ebef34486799d9b2dbdccb +pkg_resources +prettytable +prettytable +psutil +py-cpuinfo +pytest