[phenotips/phenotips] 6535f3: [misc] Fixed merge conflict

GitHub noreply at github.com
Tue Jan 23 23:49:16 EST 2018


  Branch: refs/heads/PT-2640-entities-1.4
  Home:   https://github.com/phenotips/phenotips
  Commit: 6535f3e9684ac588ccc03f96d7d7808092a6d536
      https://github.com/phenotips/phenotips/commit/6535f3e9684ac588ccc03f96d7d7808092a6d536
  Author: Sergiu Dumitriu <sergiu at phenotips.org>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M components/patient-data/impl/src/main/java/org/phenotips/data/internal/PatientEntityManager.java

  Log Message:
  -----------
  [misc] Fixed merge conflict




More information about the notifications mailing list