[SYNCOPE-1250] fix bad merge
authorfmartelli <fabio.martelli@gmail.com>
Wed, 13 Dec 2017 11:38:27 +0000 (12:38 +0100)
committerfmartelli <fabio.martelli@gmail.com>
Wed, 13 Dec 2017 11:38:27 +0000 (12:38 +0100)
commit3df09968936118ce9a36ac438a8d0a6bf498990b
treee8f3375d19c23e3c89120e0bd00bed991a10007f
parenta69afb927da75431d4963fbf62ee124da4f0aa3f
[SYNCOPE-1250] fix bad merge
client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java