resolving conflict

This commit is contained in:
Marc Ducobu
2015-02-06 11:26:09 +01:00
16 changed files with 841 additions and 31 deletions

View File

@@ -134,6 +134,10 @@ class Person {
$this->history->add($period);
}
public function removeHistoryFile(PersonHistoryFile $history) {
$this->history->remove($history);
}
/**
* set the Person file as open at the given date.
*