git: Makefile_upgrade.inc: Fix some merging artifacts.

[Sascha Wildner]

commit f66a614fb8be38a322cbec8ff65148ac2d242738
Author: Sascha Wildner <saw at online.de>
Date:   Sun May 9 00:24:43 2010 +0200

    Makefile_upgrade.inc: Fix some merging artifacts.

Summary of changes:
 Makefile_upgrade.inc |   63 +++++++++++++++++++++++---------------------------
 1 files changed, 29 insertions(+), 34 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/f66a614fb8be38a322cbec8ff65148ac2d242738


-- 
DragonFly BSD source repository