From 66a9421fac8d6f274b00b54874fce926d3ef5c0b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Oct 2018 01:07:47 -0700
Subject: [PATCH] Production assets

---
 public/js/app.js         | Bin 434113 -> 435722 bytes
 public/mix-manifest.json |  21 ++-------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/public/js/app.js b/public/js/app.js
index 56b6528e75eda24d141d5c5af041a7e578ccf13d..7f52e74c0d6e828eb20537e43a79c0503d4f05a5 100644
GIT binary patch
delta 1110
zcmZ`(OHUI~6wbim7BvXfKq88aqhM>Mr3eMA0zN1jP%sF-OP#j2Wpp|NGglC66Nw9q
z3pF8n7FH4$EH%2Cm8iIJVWRH%0UBMH04t4g;Y<Z=jV^A^<onL^J9qA@7nQf(RzAI1
z2A7%+3g{arn{ZJi-B=ZdYn&h7HIU8d`@uO%cJqv0VIGCXnUKb38De=`cvTA@)f7)M
z=F#GDgEG&uUzDnh>NppL?WJN;(i5^85PZCJnQ1vm>vOYWCJc|bX0z=Aoa8KfPl6o<
z_#+IPaHf%z;mZu!n61e*qs0xZGpHI1k5MJ6C2>K5iacO#1cWT$S@vj&fcHpF2z9qJ
zZ&-FQuQtqNO*Oo^q^Mq26nC4aKJZT-GZEOCSMN;(LV3WhDAeQu{ZVKv&#loar_*V7
z$Q{D!1hgSLQs~6A{k6En0jl3P2hJs63x1E0N_?In6>C;kU<=!E{~;+YH&l6;dYBYZ
zsE`)VStBJ~4Y*WCD$Lp#eCF_dE8+iWx8*<k(&fYu!->7527__<Qlh$qh%UIrti`Pf
zXkYDbXQe1HrW=8j!NwID5VBoKikwgbIGunhyZ_>x{=N027>_p)xKD`#9|uY3UR}ZR
zD*YH5f+yBZvy6x>GK~Jk)$Fw;TVA3yqCMk~Y<R<?F5!g5@TamDfbzklBrAMe(|MJS
z@dF0cjdpz6NxJZf47ZB}f3l%>stkJZ`g!v4#;kL4*2!6?z&eHItP?tpLeCjx3_r|p
z6}Ue|*5kw=G(vyRVQtC@z2=>Z;B>%QrBhpV0T^%YYr?NXq;G>i5^svdeLg|d#ce(@
zm3B`~kAOKnQuJvals$)nR+5N0(oHnSU{X@01l7ZFSvOc%m6B8tZ4m>)vEK~eX)}C}
z&7{SY91935F^cq`kfRonjllUnQp^92lA=r=l^Bh!6gaQ~m_PeST~TeGxPh#)|M(qD
p*J<*a2fy`5;6hhnc~%Cqc$`!h6xs^hy-J#J-yl?(wJGvo$1m%pfWiO(

delta 350
zcmeA=BXw}U)P@cL=3Ha{=^MqE<fl7CFdH=gRBZpL$OyztK+L@Try`4nFN<$VSj2S0
zE*7)tL5*y((-resVp#lA{Ys`UFk(xY{6V0G-B_u%Rwp`dx}QIr%H(XJN=B2-Pldu5
zfs~Di3e)5S8FnT^qsb>ET_zWZNp7~6ddE2Z2{V%rb4iNQbVFVy<;g2#UQAviYanQ<
zker{Ro13DWpO#jfTB2(>`JSxVWD_~@>Af6G?31J9WTvlVVd9>iFTfNz-A|B77-Tl1
z$z(?Pbzo9w@*VlI>8py_c&0!1X5*b~pjf)SHlHPhy*;y>WqW2h>*E_N*&&_=(+}ja
zNkKezFOMxqA~Ds_DA6d*LP@7cN6|p1x>mDRC&$v+b+RB!()LXOZ29cd+auWIwjYmR
i(`DT*8^?A)0TKic>)1rWCT{;#$0pCTy`Yh8mI?sCymJ-+

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index dd8e6ef534..f29ebdebae 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,33 +1,16 @@
 {
-<<<<<<< HEAD
-    "/js/build/vue.js": "/js/build/vue.js?id=385b35bd13d097237275",
-    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=5002486f605469c322ed",
-    "/css/build/app.css": "/css/build/app.css?id=0c4d55f9abe9a4efe526",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=d694e63456d4ed2ba993",
-    "/css/build/AdminLTE.css.map": "/css/build/AdminLTE.css.map?id=fa40c591a5b361cb0761",
-    "/css/build/app.css.map": "/css/build/app.css.map?id=5a1bc8c3be0d3da37d0a",
-    "/css/all.css": "/css/all.css?id=2d7f3b6654a518d7e0c5",
-=======
-    "/js/app.js": "/js/app.js?id=53c985bd6a8f4bf9fe99",
+    "/js/app.js": "/js/app.js?id=496b2158637db1de24ee",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dad91a899cd02dd115e1",
     "/css/build/app.css": "/css/build/app.css?id=0218d2aa64219ffbb011",
-    "/css/all.css": "/css/all.css?id=9ce4e1808f9f4abb9180",
->>>>>>> 1742867df17c19f2aec1fcf08900456006223858
+    "/css/all.css": "/css/all.css?id=f1e562babc5a1962b7f2",
     "/css/skins/skin-green-dark.min.css": "/css/skins/skin-green-dark.min.css?id=1039ae0e198a7f3d8da7",
     "/css/skins/skin-orange-dark.min.css": "/css/skins/skin-orange-dark.min.css?id=9a461970f7ab07f40847",
     "/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795",
     "/css/signature-pad.css": "/css/signature-pad.css?id=6a89d3cd901305e66ced",
     "/css/signature-pad.min.css": "/css/signature-pad.min.css?id=6a89d3cd901305e66ced",
-<<<<<<< HEAD
-    "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
-    "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
-    "/js/dist/all.js": "/js/dist/all.js?id=8acd0023559eaaddd6c5",
-    "/js/build/all.js": "/js/build/all.js?id=8acd0023559eaaddd6c5",
-=======
     "/js/vendor.js": "/js/vendor.js?id=346e7071aeba37b24fe5",
     "/js/html5shiv.min.js": "/js/html5shiv.min.js?id=ba846cb704dbfbc5f1b3",
     "/js/respond.min.js": "/js/respond.min.js?id=afc1984a3d17110449dc",
->>>>>>> 1742867df17c19f2aec1fcf08900456006223858
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7223478ba9bf2c6dfb4f",
     "/js/dist/bootstrap-table-simple-view.js": "/js/dist/bootstrap-table-simple-view.js?id=3926b8f4aaad6ca20d31",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=8340c60bfbc12c34d2e6"