fixed incomplete merge action

b3c07f16 · Bas van Kervel · ec6a7b35 · b3c07f16 · b3c07f16
Commit b3c07f16 authored Jun 11, 2015 by Bas van Kervel
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 703 deletions

js.go cmd/console/js.go +1 -1

ipc_windows.go rpc/comms/ipc_windows.go +0 -702

No files found.
--- a/cmd/console/js.go
+++ b/cmd/console/js.go
@@ -84,7 +84,7 @@ func loadAutoCompletion(js *jsre, ipcpath string) {
 	if err != nil {
 		utils.Fatalf("Unable to determine supported modules - %v", err)
 	}
-	
+
 	loadedModulesMethods = make(map[string][]string)
 	for module, _ := range modules {
 		loadedModulesMethods[module] = api.AutoCompletion[module]

--- a/rpc/comms/ipc_windows.go
+++ b/rpc/comms/ipc_windows.go