---
- branch: MAIN
  date: Thu Jun  8 15:54:32 UTC 2017
  files:
  - new: '1.3'
    old: '1.2'
    path: src/sys/external/bsd/libfdt/dist/libfdt_env.h
    pathrev: src/sys/external/bsd/libfdt/dist/libfdt_env.h@1.3
    type: modified
  id: 20170608T155432Z.7f1b5b4613c13c9b6fcc114e78adabd5ae2aab5f
  log: "Merge conflicts\n"
  module: src
  subject: 'CVS commit: src/sys/external/bsd/libfdt/dist'
  unixtime: '1496937272'
  user: skrll