mirror of
https://github.com/astaxie/beego.git
synced 2025-06-19 17:20:38 +00:00
fix conflicts
This commit is contained in:
@ -16,10 +16,6 @@ package beego
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
<<<<<<< HEAD
|
|
||||||
"html/template"
|
|
||||||
=======
|
|
||||||
>>>>>>> astaxie/develop
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
Reference in New Issue
Block a user