[12gevmoller_sim] [JeffersonLab/remoll] e406ed: Fix: remaining conflict markers from merge

[GitHub]

  Branch: refs/heads/integration-dose
  Home:   https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=ZLEJEh7iRTDsVLtyBqVaSpDBOcbMO-BZxk0RrIDtmiU&s=4KmDkBeAp7MD7JOeYMk3t5ah-TovlyqIO6u-PN--akI&e= 
  Commit: e406edf7cb271bcb7273504f1002c9e20469db31
      https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_e406edf7cb271bcb7273504f1002c9e20469db31&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=ZLEJEh7iRTDsVLtyBqVaSpDBOcbMO-BZxk0RrIDtmiU&s=oPjX0jOHJc552lHUDtJCRWPwh_iXzidiFIKw7e09qn8&e= 
  Author: Wouter Deconinck <wdconinc at gmail.com>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M geometry_dose/hybridDaughter.gdml

  Log Message:
  -----------
  Fix: remaining conflict markers from merge


  Commit: 25b652f6bb25e83010fcd9318eece291ec2b6ec0
      https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_commit_25b652f6bb25e83010fcd9318eece291ec2b6ec0&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=ZLEJEh7iRTDsVLtyBqVaSpDBOcbMO-BZxk0RrIDtmiU&s=-KwX575sbvWQLDWmSRiFu-0l4vnc40Yf_LyMvY56xvE&e= 
  Author: Wouter Deconinck <wdconinc at gmail.com>
  Date:   2018-07-25 (Wed, 25 Jul 2018)

  Changed paths:
    M geometry_dose/hybridDaughter.gdml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/dose' into integration-dose


Compare: https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_remoll_compare_8e92302b84c2...25b652f6bb25&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=ZLEJEh7iRTDsVLtyBqVaSpDBOcbMO-BZxk0RrIDtmiU&s=1hhdLvVgW5Sn6yKpE1okVXD8p7jSPQsonSNCDflJSOY&e= 
      **NOTE:** This service been marked for deprecation: https://urldefense.proofpoint.com/v2/url?u=https-3A__developer.github.com_changes_2018-2D04-2D25-2Dgithub-2Dservices-2Ddeprecation_&d=DwICaQ&c=lz9TcOasaINaaC3U7FbMev2lsutwpI4--09aP8Lu18s&r=3B3cpV8BW_CcRY44e0IgDNmqzlTXeeJsbWtRdt_HYCM&m=ZLEJEh7iRTDsVLtyBqVaSpDBOcbMO-BZxk0RrIDtmiU&s=2MDS89IccV9wFzo1R4z_BibVexoX1Y5FugmpL9u7Q3M&e= 

      Functionality will be removed from GitHub.com on January 31st, 2019.