Attempt to resolve merge conflict

[akkoma] / priv / static / packs / mailer.js

diff --git a/priv/static/packs/mailer.js b/priv/static/packs/mailer.js
index 3a5d742dd22c8088a867e2a2a9029027c22f91f5..09aadd4bd573011a1475865d7fdb38396c16f842 100644 (file)
--- a/priv/static/packs/mailer.js
+++ b/priv/static/packs/mailer.js
@@ -1,2 +1,2 @@
-webpackJsonp([68],{689:function(n,c,o){o(690)},690:function(n,c){}},[689]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[89],{451:function(n,o,w){},452:function(n,o,w){w(451)}},[[452,0]]]);
 //# sourceMappingURL=mailer.js.map
\ No newline at end of file