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

[GitHub]

  Branch: refs/heads/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=GR7cLfjzDK5oJma6zkH4yg7PgIzGoMMvIH5GEvK9Yxs&s=VFjHiz9S1Bfv0qavHinW4JgZOqFPJNdIbdRF6uOv0ME&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=GR7cLfjzDK5oJma6zkH4yg7PgIzGoMMvIH5GEvK9Yxs&s=Mu51_sB8VIe_rd441djagKCJe-lkwCw0LGSH4bLJTow&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



      **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=GR7cLfjzDK5oJma6zkH4yg7PgIzGoMMvIH5GEvK9Yxs&s=2RpLjR_NMQPZmqlzpfgZWsZQH9wmJbZYCU-xEloUzx8&e= 

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