From 1dc5457757fff3ecc197c64ea44e18bf367ea051 Mon Sep 17 00:00:00 2001
From: Alex Matrosov <alex.matrosov@gmail.com>
Date: Sun, 29 Apr 2018 22:35:51 -0700
Subject: [PATCH] Update uefitool.cpp

---
 UEFITool/uefitool.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UEFITool/uefitool.cpp b/UEFITool/uefitool.cpp
index ca34d32..f3c0a65 100644
--- a/UEFITool/uefitool.cpp
+++ b/UEFITool/uefitool.cpp
@@ -17,11 +17,7 @@
 UEFITool::UEFITool(QWidget *parent) :
 QMainWindow(parent),
 ui(new Ui::UEFITool),
-<<<<<<< HEAD
 version(tr("NE alpha 48"))
-=======
-version(tr("NE alpha 47"))
->>>>>>> 775ad7d25b97e266928f437af14b47d38578af63
 {
     clipboard = QApplication::clipboard();