From 0811b38ee3ff1cc361f85edf40e7ce137d266877 Mon Sep 17 00:00:00 2001
From: "Brian (bex) Exelbierd" <bex@pobox.com>
Date: Fri, 13 Apr 2018 14:11:08 +0200
Subject: [PATCH] adding wine topic_map

---
 _topic_map.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/_topic_map.yml b/_topic_map.yml
index dab04ee..ea30166 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -69,7 +69,8 @@ Topics:
     File: bumblebee
   - Name: Creating GPG Keys
     File: create-gpg-keys
-<<<<<<< HEAD
+  - Name: Wine
+    File: wine
 # - Name: (CHECK) GRUB 2
 #   File: grub2
 # - Name: (FIX ME!) AutoUpdates
@@ -118,5 +119,3 @@ Topics:
 #   File: upgrading
 # - Name: (FIX ME!) Upgrading Fedora using package manager
 #   File: upgrading-fedora-online
-# - Name: (FIX ME!) Wine
-#   File: wine