diff options
| author | Håkon Hallingstad <hakon@yahoo-inc.com> | 2016-09-05 15:23:45 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@yahoo-inc.com> | 2016-09-05 15:23:45 +0200 |
| commit | 0562d28182ee8326a870f7926fe17d29673ed2d1 (patch) | |
| tree | f8df89f6cdaeae123eea2dcc0cf8517d4b045e4f /docker-api | |
| parent | 63ac82190522c63fbd6dac5f2e7439304de1ac4b (diff) | |
| parent | d0d055a239f6ffa959174e37577537b51eebf556 (diff) | |
Resolve merge conflict
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 419c1165f4c..772b823c59f 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -386,4 +386,4 @@ public class DockerImpl implements Docker { } } } -}
\ No newline at end of file +} |