diff options
| author |  Martin Wicke <wicke@google.com> | 2016-06-30 01:11:12 -0700 |
|---|---|---|
| committer | Martin Wicke <wicke@google.com> | 2016-06-30 08:10:25 -0700 |
| commit | 30fc952faa4b100bc19ec1a7009e55c55a1b949b (patch) | |
| tree | 71e70bb6faf5436aa4a5ad4ba1eb699ddcf683a7 /tensorflow/python | |
| parent | 125a96af8d0f2585c13f580ec4e8eb7d845fa3a9 (diff) | |
| parent | 896086b24f0431e18af378a0d71d0494c221b356 (diff) | |
Merging r0.9 back to master
Diffstat (limited to 'tensorflow/python')
| -rw-r--r-- | tensorflow/python/ops/data_flow_ops.py | 2 | ||||
| -rw-r--r-- | tensorflow/python/ops/nn.py | 2 | ||||
| -rw-r--r-- | tensorflow/python/training/saver_test.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tensorflow/python/ops/data_flow_ops.py b/tensorflow/python/ops/data_flow_ops.py index 56dfde3bfb..9b1381eebf 100644 --- a/tensorflow/python/ops/data_flow_ops.py +++ b/tensorflow/python/ops/data_flow_ops.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# ============================================================================== +#============================================================================== """Data Flow Operations.""" # pylint: disable=g-bad-name diff --git a/tensorflow/python/ops/nn.py b/tensorflow/python/ops/nn.py index f798160111..79030645f2 100644 --- a/tensorflow/python/ops/nn.py +++ b/tensorflow/python/ops/nn.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# ============================================================================== +# ============================================================================= # pylint: disable=unused-import,g-bad-import-order """## Activation Functions diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py index 3aeceaac12..5a42472a29 100644 --- a/tensorflow/python/training/saver_test.py +++ b/tensorflow/python/training/saver_test.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# ============================================================================== +# ============================================================================= """Tests for tensorflow.python.training.saver.py.""" from __future__ import absolute_import |