From 205a3135ef5c3df8354afcc1780c5a701c8d2522 Mon Sep 17 00:00:00 2001
From: "A. Svensson" <lmasvensson@gmail.com>
Date: Sun, 19 Jun 2016 16:18:08 +0200
Subject: [PATCH] Move web instance struct to web.go

---
 src/models.go | 14 --------------
 src/web.go    | 11 +++++++++++
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/models.go b/src/models.go
index 6a7329f..d64f21b 100644
--- a/src/models.go
+++ b/src/models.go
@@ -2,23 +2,9 @@ package ss13
 
 import (
 	"fmt"
-	"html/template"
 	"time"
-
-	"github.com/gorilla/mux"
 )
 
-type D map[string]interface{}
-
-type Instance struct {
-	Config *Config
-	Debug  bool
-
-	db     *DB
-	router *mux.Router
-	tmpls  *template.Template
-}
-
 // Database models
 
 type Server struct {
diff --git a/src/web.go b/src/web.go
index 2a8ba94..31346d5 100644
--- a/src/web.go
+++ b/src/web.go
@@ -12,6 +12,17 @@ import (
 	"github.com/gorilla/mux"
 )
 
+type D map[string]interface{}
+
+type Instance struct {
+	Config *Config
+	Debug  bool
+
+	db     *DB
+	router *mux.Router
+	tmpls  *template.Template
+}
+
 func New(debug bool, path string) (*Instance, error) {
 	// WHen in debug mode we load the assets from disk instead of the
 	// embedded ones.