clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 21:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

missed these merge conflicts when manually rebasing too many files

Browse Source 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
This commit is contained in:
SvenDowideit
2014-07-03 11:07:42 +10:00
parent 9fe95f1c5b
commit f8d9ecfb2c
13 changed files with 13 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/man/docker-save.1.md
+1 -6
View File
@@ -33,10 +33,5 @@ fedora image to a fedora-latest.tar:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>