[wesnoth-commits] [wesnoth/wesnoth] f49a02: Fix merge error

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f49a02d839b62c4b125aeb440c760b462c9d53c3
      https://github.com/wesnoth/wesnoth/commit/f49a02d839b62c4b125aeb440c760b462c9d53c3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-11-17 (Sat, 17 Nov 2018)

  Changed paths:
    M src/actions/attack.cpp

  Log Message:
  -----------
  Fix merge error


  Commit: 9e518a666fc7b6fb48e940509d5b2eb5e618a0cb
      https://github.com/wesnoth/wesnoth/commit/9e518a666fc7b6fb48e940509d5b2eb5e618a0cb
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-11-17 (Sat, 17 Nov 2018)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Update changelog for recent merges


  Commit: 1d76a98041f1c519620019d2b1f3a7fe7e1389d2
      https://github.com/wesnoth/wesnoth/commit/1d76a98041f1c519620019d2b1f3a7fe7e1389d2
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2018-11-17 (Sat, 17 Nov 2018)

  Changed paths:
    M data/core/about.cfg

  Log Message:
  -----------
  Update credits for recent merge

@holius-fr


Compare: https://github.com/wesnoth/wesnoth/compare/7b358440f6c6...1d76a98041f1
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

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