remove redundant chef config call. merge error?

Ezra Zygmuntowicz · Ezra Zygmuntowicz · commit 0145c1ff48f0 · 2008-10-09T19:56:39.000-07:00
diff --git a/chef-server/bin/chef-server b/chef-server/bin/chef-server
@@ -43,6 +43,4 @@ else
   )
 end
 
-Chef::Config.from_file(File.join("/etc/", "chef", "server.rb"))
-
 Merb.start

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,4 @@ else`
`43`	`43`	`)`
`44`	`44`	`end`
`45`	`45`
`46`		`-Chef::Config.from_file(File.join("/etc/", "chef", "server.rb"))`
`47`		`-`
`48`	`46`	`Merb.start`