mirror of
https://github.com/LongSoft/UEFITool.git
synced 2025-05-28 22:16:03 -04:00
Update uefitool.cpp
This commit is contained in:
parent
e3ace324ee
commit
1f120b821d
1 changed files with 0 additions and 4 deletions
|
@ -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();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue