jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-24 00:48:23 +08:00
Code Issues Projects Releases Wiki Activity

Update uefitool.cpp

Browse Source
This commit is contained in:
Alex Matrosov 2018-04-29 22:35:51 -07:00 committed by GitHub
parent bbd613a166
commit 1dc5457757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UEFITool/uefitool.cpp
View File

@ -17,11 +17,7 @@
UEFITool::UEFITool(QWidget *parent) : UEFITool::UEFITool(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::UEFITool), ui(new Ui::UEFITool),
<<<<<<< HEAD
version(tr("NE alpha 48")) version(tr("NE alpha 48"))
=======
version(tr("NE alpha 47"))
>>>>>>> 775ad7d25b97e266928f437af14b47d38578af63
{ {
clipboard = QApplication::clipboard(); clipboard = QApplication::clipboard();