From 72cef46e5e504355266b9c83bd3693d07a35d0ee Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Tue, 9 Apr 2013 07:44:44 -0700
Subject: [PATCH] Fix merge issue

---
 docker/docker.go | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/docker/docker.go b/docker/docker.go
index 7e1dfd00ea..1b1c21990d 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -56,15 +56,6 @@ func daemon() error {
 }
 
 func runCommand(args []string) error {
-	var oldState *term.State
-	var err error
-	if term.IsTerminal(int(os.Stdin.Fd())) && os.Getenv("NORAW") == "" {
-		oldState, err = term.MakeRaw(int(os.Stdin.Fd()))
-		if err != nil {
-			return err
-		}
-		defer term.Restore(int(os.Stdin.Fd()), oldState)
-	}
 	// FIXME: we want to use unix sockets here, but net.UnixConn doesn't expose
 	// CloseWrite(), which we need to cleanly signal that stdin is closed without
 	// closing the connection.