commit 1c8810deed04b5dec988d809195258dc5d780bed
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Oct 18 16:38:23 2018 +0200
Release 0.0.20181018
.gitignore | 4 +---
sources | 2 +-
wireguard.spec | 5 ++++-
3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d8d20e..4e615b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
/WireGuard-0.0.20180918.tar.xz
/WireGuard-0.0.20180925.tar.xz
-<<<<<<< HEAD
-=======
/WireGuard-0.0.20181006.tar.xz
/WireGuard-0.0.20181007.tar.xz
->>>>>>> 8be4325... Release 0.0.20181007
+/WireGuard-0.0.20181018.tar.xz
diff --git a/sources b/sources
index 5c09344..b26d773 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b798d35a544ac4578458ee6c7aefa5ed WireGuard-0.0.20181007.tar.xz
+f6c9956a447f8f97159144467083c7fb WireGuard-0.0.20181018.tar.xz
diff --git a/wireguard.spec b/wireguard.spec
index dc0636a..ce1b626 100644
--- a/wireguard.spec
+++ b/wireguard.spec
@@ -1,6 +1,6 @@
Name: wireguard
Summary: Fast, modern, secure VPN tunnel
-Version: 0.0.20181007
+Version: 0.0.20181018
Release: 1%{?dist}
License: GPLv2
@@ -82,6 +82,9 @@ popd
%changelog
+* Thu Oct 18 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20181018-1
+- Release 0.0.20181018
+
* Sun Oct 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20181007-1
- Release 0.0.20181007