fix conflicts

90344a7b · ysqi · 92086288 · 90344a7b
Commit 90344a7b authored Mar 06, 2016 by ysqi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

config.go config.go +0 -4

No files found.
--- a/config.go
+++ b/config.go
@@ -16,10 +16,6 @@ package beego

 import (
 	"fmt"
-<<<<<<< HEAD
-	"html/template"
-=======
->>>>>>> astaxie/develop
 	"os"
 	"path/filepath"
 	"strings"