[phobos] [D-Programming-Language/phobos] a447bf: Fixed merged conflict.

[noreply at github.com]

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

  Commit: a447bf81cb147f7fcae6cf7e2d6debca8b8166da
      https://github.com/D-Programming-Language/phobos/commit/a447bf81cb147f7fcae6cf7e2d6debca8b8166da
  Author: jmdavis <jmdavisProg at gmx.com>
  Date:   2011-09-04 (Sun, 04 Sep 2011)

  Changed paths:
    M std/bigint.d
  M std/format.d
  M std/functional.d
  M std/internal/math/biguintcore.d
  M std/parallelism.d
  M std/range.d
  M std/socket.d
  M std/uni.d
  M std/windows/registry.d

  Log Message:
  -----------
  Fixed merged conflict.

Conflicts:
	std/format.d


  Commit: 07642049be3cc2cef9bbfd88a82b23364705cbd8
      https://github.com/D-Programming-Language/phobos/commit/07642049be3cc2cef9bbfd88a82b23364705cbd8
  Author: Andrei Alexandrescu <andrei at erdani.com>
  Date:   2011-09-04 (Sun, 04 Sep 2011)

  Changed paths:
    M std/format.d
  M std/stream.d
  M std/system.d

  Log Message:
  -----------
  Merge pull request #186 from jmdavis/system

Adjustments to std.system.


Compare: https://github.com/D-Programming-Language/phobos/compare/4c8cbd2...0764204