diff --git a/test/3x/tensorflow/keras/requirements.txt b/test/3x/tensorflow/keras/requirements.txt index 2687ec428f8..430015c1322 100644 --- a/test/3x/tensorflow/keras/requirements.txt +++ b/test/3x/tensorflow/keras/requirements.txt @@ -1,18 +1,18 @@ <<<<<<< HEAD -intel-extension-for-tensorflow[cpu] -prettytable -py-cpuinfo -prettytable -psutil -pkg_resources ======= <<<<<<< HEAD ======= >>>>>>> 0219c55059a59365e1ebef34486799d9b2dbdccb +>>>>>>> 86fa8ff37929810f251d2e35db88c143410b160f intel-extension-for-tensorflow[cpu] +intel-extension-for-tensorflow[cpu] +pkg_resources pkg_resources prettytable prettytable +prettytable +prettytable +psutil psutil py-cpuinfo ->>>>>>> 86fa8ff37929810f251d2e35db88c143410b160f +py-cpuinfo diff --git a/test/3x/tensorflow/requirements.txt b/test/3x/tensorflow/requirements.txt index 1ae6cd0066b..bd5ebec2626 100644 --- a/test/3x/tensorflow/requirements.txt +++ b/test/3x/tensorflow/requirements.txt @@ -1,18 +1,18 @@ <<<<<<< HEAD -prettytable -py-cpuinfo -pytest -prettytable -psutil -pkg_resources ======= <<<<<<< HEAD ======= >>>>>>> 0219c55059a59365e1ebef34486799d9b2dbdccb +>>>>>>> 86fa8ff37929810f251d2e35db88c143410b160f pkg_resources +pkg_resources +prettytable prettytable prettytable +prettytable +psutil psutil py-cpuinfo +py-cpuinfo +pytest pytest ->>>>>>> 86fa8ff37929810f251d2e35db88c143410b160f