diff options
| author | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
|---|---|---|
| committer | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
| commit | 1a34cc1e3ebf152505ed591787a7778744020bbd (patch) | |
| tree | 4dc3054b63ef53b32ba0591aca8c317b8cd2cd8d /docker/android-ndk | |
| parent | 2fbf5a2cadabb503306af4a59c1f98596784e488 (diff) | |
| parent | 77879cf10f7857b95c968446f5ce9e0437bceb0f (diff) | |
solved merge conflict
Diffstat (limited to 'docker/android-ndk')
| -rw-r--r-- | docker/android-ndk/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 49b08dcc..8e7a124b 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -36,4 +36,5 @@ ENV PATH ${PATH}:${ANDROID_NDK_HOME} # Accept all licenses RUN yes | sdkmanager --licenses -RUN sdkmanager --list
\ No newline at end of file +RUN sdkmanager --list + |