Changeset 76557842 for README.md


Ignore:
Timestamp:
04/16/13 12:14:28 (15 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
Children:
750d224
Parents:
4d0d420
Message:

Fix bad merge, correct my files, oops!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • README.md

    r4d0d420 r76557842  
    1 <<<<<<< HEAD 
    2 pcbsd-projects 
    3 ============== 
    4  
    5 Work in progress projects for PC-BSD 
    6 ======= 
    71pcbsd 
    82===== 
     
    2822  Shell code which builds into pcbsd-utils package. Scripts, backends and various CLI 
    2923  related utilities for TrueOS & PC-BSD.  
    30 >>>>>>> pcbsd/master 
Note: See TracChangeset for help on using the changeset viewer.