dhis2-documenters team mailing list archive

Thread
Date

dhis2-documenters team
Mailing list archive
Message #01675

[dhis2/dhis2-docs] 759acc: Fixes conflict markers

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: rachael <rachael@xxxxxxxxx>
Date: Tue, 04 Oct 2016 06:28:59 -0700
Reply-to: rachael <rachael@xxxxxxxxx>
Sender: rachael=dhis2.org@xxxxxxxxxx

  Branch: refs/heads/rach-GIS
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 759acc0f557e1f8047efe7476b2c66cd06760dff
      https://github.com/dhis2/dhis2-docs/commit/759acc0f557e1f8047efe7476b2c66cd06760dff
  Author: rachael <rachael@xxxxxxxxx>
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
    M src/docbkx/en/content/analysis/gis/c_gis.xml
    M src/docbkx/en/content/analysis/using_gis.xml

  Log Message:
  -----------
  Fixes conflict markers