summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0')
-rw-r--r--metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.04
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0
index b4b8ebe5df85..664694a9c4e8 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0
@@ -11,5 +11,9 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_p
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/tensorflow/estimator/archive/v1.15.0.tar.gz -> tensorflow-estimator-1.15.0.tar.gz
+<<<<<<< HEAD
_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+=======
+_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+>>>>>>> next
_md5_=0cdd8849026f37b6217af87c7d805db4