From 90344a7b8f47d8890ff3db56cab49fe10b35c986 Mon Sep 17 00:00:00 2001
From: ysqi <devysq@gmail.com>
Date: Sun, 6 Mar 2016 21:25:43 +0800
Subject: [PATCH] fix conflicts

---
 config.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config.go b/config.go
index 4f85ce02..2761e7cb 100644
--- a/config.go
+++ b/config.go
@@ -16,10 +16,6 @@ package beego
 
 import (
 	"fmt"
-<<<<<<< HEAD
-	"html/template"
-=======
->>>>>>> astaxie/develop
 	"os"
 	"path/filepath"
 	"strings"