Fix merge conflict.

server/publications/settings.js

@@ -0,0 +1,13 @@
+Meteor.publish('setting', () => {
+  return Settings.find({}, {fields:{disableRegistration: 1}});
+});
+
+Meteor.publish('mailServer', function () {
+  if (!Match.test(this.userId, String))
+    return [];
+  const user = Users.findOne(this.userId);
+  if(user && user.isAdmin){
+    return Settings.find({}, {fields: {mailServer: 1}});
+  }
+  return [];
+});

server/publications/users.js

@@ -9,3 +9,11 @@ Meteor.publish('user-miniprofile', function(userId) {
     },
   });
 });
+
+Meteor.publish('user-admin', function() {
+  return Meteor.users.find(this.userId, {
+    fields: {
+      isAdmin: 1,
+    },
+  });
+});