From 36f723e59f06d46e0f8014f251733e45234ebdc4 Mon Sep 17 00:00:00 2001
From: Kyle Robertze <krobbertze@gmail.com>
Date: Sat, 4 Feb 2017 13:43:30 +0200
Subject: [PATCH] added missing copyright statement

---
 src/modules/packages/main.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py
index 2197ae12c..d0f34a08f 100644
--- a/src/modules/packages/main.py
+++ b/src/modules/packages/main.py
@@ -4,11 +4,8 @@
 # === This file is part of Calamares - <http://github.com/calamares> ===
 #
 #   Copyright 2014, Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-<<<<<<< HEAD
 #   Copyright 2015-2017, Teo Mrnjavac <teo@kde.org>
-=======
-#   Copyright 2016, Kyle Robbertze <kyle@aims.ac.za>
->>>>>>> corrected packages module features so that they are up to date
+#   Copyright 2016-2017, Kyle Robbertze <kyle@aims.ac.za>
 #
 #   Calamares is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by