[Licq-commits] [licq-im/licq] 6fd17e: qt4-gui: Fix merge faults in add user dialog

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/licq-im/licq
  Commit: 6fd17e074775d6af329bc383a9d217a46a37b028
      
https://github.com/licq-im/licq/commit/6fd17e074775d6af329bc383a9d217a46a37b028
  Author: Anders Olofsson <fl...@licq.org>
  Date:   2012-11-17 (Sat, 17 Nov 2012)

  Changed paths:
    M qt4-gui/src/dialogs/adduserdlg.cpp
    M qt4-gui/src/dialogs/adduserdlg.h

  Log Message:
  -----------
  qt4-gui: Fix merge faults in add user dialog