Ignore:
Timestamp:
04/16/13 12:14:28 (17 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
750d224
Parents:
4d0d420
Message:

Fix bad merge, correct my files, oops!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/port-files/Makefile

    r4d0d420 r76557842  
    11# New ports collection makefile for:    pcbsd-utils 
    2 <<<<<<< HEAD 
    3 # Date created:                         01 Feb 2013 
    4 ======= 
    52# Date created:                         04 Feb 2013 
    6 >>>>>>> pcbsd/master 
    73# Whom:                                 Kris Moore <kmoore@FreeBSD.org> 
    84# 
Note: See TracChangeset for help on using the changeset viewer.