Resolve conflict

keras-team · Jun 10, 2023 · 72a035f · 72a035f
1 parent 92281f6
commit 72a035f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/keras/engine/training.py b/keras/engine/training.py
@@ -34,6 +34,7 @@
 from keras.engine import data_adapter
 from keras.engine import functional
 from keras.engine import input_layer as input_layer_module
+from keras.engine import steps_per_execution_tuning
 from keras.layers.activation import Softmax as SoftmaxLayer
 from keras.engine import training_utils
 from keras.metrics import base_metric