Updating manual pages for 1.0.12

Signed-off-by: Mortier Benoit <benoit.mortier@opensides.be>

Conflicts:
	contrib/man/fusiondirectory-insert-schema.1
	contrib/man/fusiondirectory-setup.1
	contrib/man/fusiondirectory.conf.5

contrib/man/fusiondirectory-insert-schema.1

@@ -133,11 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
-<<<<<<< HEAD
 .TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation"
-=======
-.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
->>>>>>> 483246f... Updating manpages for 1.0.10
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

contrib/man/fusiondirectory-setup.1

@@ -162,6 +162,9 @@ This option perform a check on FusionDirectory's config file.
 .IP "\-\-check\-ldap" 4
 .IX Item "--check-ldap"
 This option check your \s-1LDAP\s0 tree. Looking for admin account, and groups or people branch. If one of those don't exists, the script will ask you what to do.
+.IP "\-\-check\-ids" 4
+.IX Item "--check-ids"
+This option check your \s-1LDAP\s0 tree for duplicated uidNumber or gidNumber among users and groups.
 .IP "\-\-migrate\-users" 4
 .IX Item "--migrate-users"
 This option add FusionDirectory attributes to the people branch.

contrib/man/fusiondirectory.conf.5

@@ -133,11 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY.CONF 1"
-<<<<<<< HEAD
 .TH FUSIONDIRECTORY.CONF 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation"
-=======
-.TH FUSIONDIRECTORY.CONF 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
->>>>>>> 483246f... Updating manpages for 1.0.10
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l