Resolve merge conflict with social-backup-poc

briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupManager.java

@@ -78,4 +78,11 @@ public interface SocialBackupManager extends
 	 */
 	byte[] getReturnShardPayloadBytes(Transaction txn, ContactId contactId)
 			throws DbException;
+
+
+	/**
+	 * Get a list of the contact ids of your custodians, or an empty
+	 * list if no backup exists.
+	 */
+	List<ContactId> getCustodianContactIds(Transaction txn);
 }