Merge branch 'master' into v3-experimental

2016-08-02 14:54:11 -05:00
parent 390f75c0e1 09f1ca5b00
commit 448d748991
1 changed files with 6 additions and 6 deletions
@@ -26,12 +26,12 @@ type Logger interface {
 // LogLevelFromString converts log level string to constant
 //
 // Valid levels:
-//   trace
-//	 debug
-//	 info
-//	 warn
-//   error
-//	 none
+//	trace
+//	debug
+//	info
+//	warn
+//	error
+//	none
 func LogLevelFromString(s string) (int, error) {
 	switch s {
 	case "trace":