[Commits] [wesnoth/wesnoth] c68fc0: XCode: Fix unresolved merge conflict

[GitHub]

  Branch: refs/heads/sdl2
  Home:   https://github.com/wesnoth/wesnoth
  Commit: c68fc094d7a0a4f01d00bca39eedb60b04040468
      https://github.com/wesnoth/wesnoth/commit/c68fc094d7a0a4f01d00bca39eedb60b04040468
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj

  Log Message:
  -----------
  XCode: Fix unresolved merge conflict