lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2025-03-31 11:05:59 +00:00
Code Issues Releases Activity

fix conflicts

Browse Source
This commit is contained in:
ysqi 2016-03-06 21:25:43 +08:00
parent 920862884d
commit 90344a7b8f
1 changed files with 0 additions and 4 deletions

4
config.go

@ -16,10 +16,6 @@ package beego
import (
"fmt"
<<<<<<< HEAD
"html/template"
=======
>>>>>>> astaxie/develop
"os"
"path/filepath"
"strings"