git: Makefile_upgrade.inc: Remove conflict marker.

[Sascha Wildner]

commit 01f7a031af9936eb777b119971721071af4e1f16
Author: Sascha Wildner <saw at online.de>
Date:   Thu May 6 23:00:57 2010 +0200

    Makefile_upgrade.inc: Remove conflict marker.
    
    On-behalf-of: lentferj

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

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/01f7a031af9936eb777b119971721071af4e1f16


-- 
DragonFly BSD source repository