summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2019-12-05 16:31:55 +0100
committerFlorian Bruhin <me@the-compiler.org>2019-12-05 16:31:55 +0100
commit784c55bb858e6cf3c65147a7a6d2df44564f35fe (patch)
treee97d94f19991cced999d0bf3125edc7bf5ccca3d
parent930db6332ef67b88cd47374a3fbfe082dd1ca2b8 (diff)
downloadqutebrowser-784c55bb858e6cf3c65147a7a6d2df44564f35fe.tar.gz
qutebrowser-784c55bb858e6cf3c65147a7a6d2df44564f35fe.zip
Fix broken changelog
-rw-r--r--.gitattributes1
-rw-r--r--doc/changelog.asciidoc1
2 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 9556c6763..000000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-doc/changelog.asciidoc merge=union
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3e4cea30a..70a66e5a5 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -76,7 +76,6 @@ Fixed
handled correctly.
- Fixed crash when a search engine URL turns out to be invalid.
-v1.8.3 (unreleased)
v1.8.3 (2019-12-05)
-------------------