Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses / src / common / LoginInterface.java

package common;

import java.rmi.Remote;
import java.rmi.RemoteException;

import domain.Account;

public interface LoginInterface extends Remote {
        
        public Account checkCredentials(String usr, String pwd)throws RemoteException;

        
        
        
}