[dmd-internals] [D-Programming-Language/dmd] a0279a: merge conflict

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/dmd

  Commit: a0279a66542b326f2b663302987215ccb099927d
      https://github.com/D-Programming-Language/dmd/commit/a0279a66542b326f2b663302987215ccb099927d
  Author: Walter Bright <walter at walterbright.com>
  Date:   2011-08-11 (Thu, 11 Aug 2011)

  Changed paths:
    M src/expression.c
  M test/runnable/test22.d
  M test/runnable/testconst.d
  M test/runnable/xtest46.d

  Log Message:
  -----------
  merge conflict