[phobos] [D-Programming-Language/phobos] 73429c: fixed conflict

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/phobos
  Commit: 73429c4e3ea8f2d7eabb73deccc7b384b801ea2c
      https://github.com/D-Programming-Language/phobos/commit/73429c4e3ea8f2d7eabb73deccc7b384b801ea2c
  Author: Andrei Alexandrescu <andrei at erdani.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M std/traits.d

  Log Message:
  -----------
  fixed conflict


  Commit: c2c95ca9910fb2eac80af8758ec5f779dd11279b
      https://github.com/D-Programming-Language/phobos/commit/c2c95ca9910fb2eac80af8758ec5f779dd11279b
  Author: Andrej Mitrovic <andrej.mitrovich at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M std/traits.d

  Log Message:
  -----------
  Merge pull request #1165 from andralex/5410

Fix Issue 5410 - Variant.convertsTo(const(char)[]) seems broke


Compare: https://github.com/D-Programming-Language/phobos/compare/5756025d6461...c2c95ca9910f