Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/lib/Net/IDNA2/Exception/Nameprep.php

@@ -1,5 +1,6 @@
<?php

require_once 'Net/IDNA2/Exception.php';



class Net_IDNA2_Exception_Nameprep extends Net_IDNA2_Exception {

}
<?php
require_once 'Net/IDNA2/Exception.php';

class Net_IDNA2_Exception_Nameprep extends Net_IDNA2_Exception
{
}