M docs/honk.8 → docs/honk.8

@@ -151,16 +151,10 @@ .Ss Maintenance
 The database may grow large over time.
 The
 .Ic cleanup Op Ar days
-command exists to purge old external data, by default 30 days.
-This removes unreferenced, unsaved posts and attachments.
-It does not remove any original content.
-<<<<<< HEAD
 This will not immediately reduce the size of the database, but frees space
 for future use.
 A vacuum may be performed manually if necessary, but will require more time
 and additional disk space.
-=======
->>>>>>> 4506960 (import)
 .Pp
 Backups may be performed by running
 .Ic backup dirname .

M views/honkpage.html → views/honkpage.html

@@ -3,60 +3,24 @@ <main>
 <div class="info" id="infobox">
 <div id="srvmsg">
 {{ if .Name }}
-<<<<<<< HEAD
-<p>{{ .Name }} <span class="left1em"><a href="/u/{{ .Name }}/rss">rss</a></span>
-=======
 <p>{{ .Name }} <span style="margin-left:1em;"><a href="/u/{{ .Name }}/rss">rss</a></span>
->>>>>>> 4506960 (import)
 <p>{{ .WhatAbout }}
 {{ end }}
 <p>{{ .ServerMessage }}
 </div>
 {{ if .HonkCSRF }}
 {{ template "honkform.html" . }}
-<<<<<<< HEAD
 <script src="/honkpage.js{{ .JSParam }}" defer data-csrf="{{ .HonkCSRF }}" data-pagename="{{ .PageName }}" data-pagearg="{{ .PageArg }}" data-tophid="{{ .TopHID }}" data-srvmsg="{{ .ServerMessage }}"></script>
 {{ end }}
 {{ if .LocalJSParam }}
 <script src="/local.js{{ .LocalJSParam }}" defer></script>
-=======
-<script>
-var csrftoken = {{ .HonkCSRF }}
-var honksforpage = { }
-var curpagestate = { name: "{{ .PageName }}", arg : "{{ .PageArg }}" }
-console.log(curpagestate)
-var tophid = { }
-tophid[curpagestate.name + ":" + curpagestate.arg] = "{{ .TopHID }}"
-var servermsgs = { }
-servermsgs[curpagestate.name + ":" + curpagestate.arg] = "{{ .ServerMessage }}"
-</script>
-<script src="/honkpage.js{{ .JSParam }}"></script>
-{{ end }}
-<script>
-function playit(elem, word, wordlist, xid) {
-	import('/wonk.js').then(module => {
-		makeaguess = module.makeaguess
-		module.addguesscontrols(elem, word, wordlist, xid)
-	})
-}
-</script>
-{{ if .LocalJSParam }}
-<script src="/local.js{{ .LocalJSParam }}"></script>
->>>>>>> 4506960 (import)
 {{ end }}
 </div>
 {{ if and .HonkCSRF (not .IsPreview) }}
 <div class="info" id="refreshbox">
-<<<<<<< HEAD
 <p><button class="refresh">refresh</button><span></span>
 <button class="scrolldown">scroll down</button>
 </div>
-=======
-<p><button onclick="refreshhonks(this)">refresh</button><span></span>
-<button onclick="oldestnewest(this)">scroll down</button>
-</div>
-{{ if eq .ServerMessage "one honk maybe more" }} <script> hideelement("refreshbox")</script> {{ end }}
->>>>>>> 4506960 (import)
 {{ end }}
 <div id="honksonpage">
 <div>