[Commits] [wesnoth/wesnoth] 713711: Fixup botched conflict resolution

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 713711a2ccacf00d6910ca180b9f8928b651d679
      https://github.com/wesnoth/wesnoth/commit/713711a2ccacf00d6910ca180b9f8928b651d679
  Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
  Date:   2016-09-18 (Sun, 18 Sep 2016)

  Changed paths:
    M src/gui/widgets/settings.cpp

  Log Message:
  -----------
  Fixup botched conflict resolution