post-merge repairs

This commit is contained in:
shin- 2013-03-11 07:39:06 -07:00
parent 04adbcb80c
commit b4b078c5ae
1 changed files with 2 additions and 2 deletions

View File

@ -1,8 +1,8 @@
package client package client
import ( import (
"github.com/dotcloud/docker/future" "../future"
"github.com/dotcloud/docker/rcli" "../rcli"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"