fix merge errors

whenzei · Mar 25, 2018 · a0873b2 · a0873b2
1 parent 988a077
commit a0873b2
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
@@ -56,10 +56,6 @@ public ObservableList<Employee> getFilteredPersonList() {
         return model.getFilteredPersonList();
     }
 
-    @Override public ObservableList<Job> getFilteredJobList() {
-        return model.getFilteredJobList();
-    }
-
     @Override
     public ObservableList<Job> getFilteredJobList() {
         return model.getFilteredJobList();

diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java
@@ -233,10 +233,6 @@ public ObservableList<Employee> getEmployeeList() {
         return employees.asObservableList();
     }
 
-    @Override public ObservableList<Job> getJobList() {
-        return jobs.asObservableList();
-    }
-
     @Override
     public ObservableList<Job> getJobList() {
         return jobs.asObservableList();

diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
@@ -77,7 +77,6 @@ private static class AddressBookStub implements ReadOnlyAddressBook {
         private final ObservableList<Employee> employees = FXCollections.observableArrayList();
         private final ObservableList<Job> jobs = FXCollections.observableArrayList();
         private final ObservableList<Tag> tags = FXCollections.observableArrayList();
-        private final ObservableList<Job> jobs = FXCollections.observableArrayList();
 
         AddressBookStub(Collection<Employee> employees, Collection<Job> jobs, Collection<? extends Tag> tags) {
             this.employees.setAll(employees);