Changeset 6710145


Ignore:
Timestamp:
11/14/13 07:51:17 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
da9c5b8
Parents:
a6c8b4a
Message:

Fix the merge installer.cpp

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/installer.cpp

    ra6c8b4a r6710145  
    589589        while (!in.atEnd()) { 
    590590           QString line = in.readLine(); 
    591 <<<<<<< HEAD 
    592            if ( line.indexOf("NVIDIA") != -1 ) { 
    593 ======= 
    594591           if ( line.indexOf("nvidia") != -1 ) { 
    595 >>>>>>> parent of d208e87... Merge branch 'master' of github.com:pcbsd/pcbsd into 9.2-release 
    596592             selectedPkgs << "NVIDIA"; 
    597593             break; 
Note: See TracChangeset for help on using the changeset viewer.