.ed:

.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 ---
 name: Report a bug
 about: Report a bug in code examples
@@ -20,3 +21,27 @@ Brief description of the problem
 ```r
 # insert reprex here
 ```
+=======
+---
+name: Report a bug
+about: Report a bug in code examples
+title: ''
+labels: bug
+assignees: aphalo
+
+---
+
+Please briefly describe your problem and what output you expect. If you have an ordinary question, please don't use this form, but instead ask on stackoverflow <http://stackoverflow.com> or use the template _support question_ to raise the issue.
+
+Please include a minimal reprex. The goal of a reprex is to make it as easy as possible for me to recreate your problem so that I can fix it. If you've never heard of a reprex before, start by reading <https://www.tidyverse.org/help/#reprex>, and follow the advice further down the page. Do NOT include session info unless it's explicitly asked for, or you've used `reprex::reprex(..., si = TRUE)` to hide it away.  
+
+Delete these instructions once you have read them.
+
+---
+
+Brief description of the problem
+
+```r
+# insert reprex here
+```
+>>>>>>> Stashed changes

.gitignore

@@ -1,25 +1,33 @@
-.Rproj.user
-.Rhistory
-.RData
-*.aux
-*.bbl
-*.bcf
-*.blg
-*.out
-*.log
-cache/
-maps/
-CRC/
-backups/
-bits/
-chapters-removed/
-old-pdfs/
-old-data/
-REVIEWS/
-submission/
-from-Rob-Calver/
-cover/
-
-figure/
-
-tikz-examples/
+.Rproj.user
+.Rhistory
+.RData
+*.aux
+*.bbl
+*.bcf
+*.blg
+*.out
+*.log
+cache/
+maps/
+CRC/
+backups/
+bits/
+chapters-removed/
+old-pdfs/
+old-data/
+REVIEWS/
+submission/
+from-Rob-Calver/
+cover/
+
+figure/
+
+tikz-examples/
+
+*.html
+
+*.tex
+
+sync.ffs_db
+
+online-data/logger_1.txt