---
- branch: MAIN
  date: Mon Sep  3 11:40:09 UTC 2018
  files:
  - new: '0'
    old: 1.1.1.2
    path: src/external/bsd/nsd/dist/configlexer.c
    pathrev: src/external/bsd/nsd/dist/configlexer.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.2
    path: src/external/bsd/nsd/dist/configparser.c
    pathrev: src/external/bsd/nsd/dist/configparser.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.2
    path: src/external/bsd/nsd/dist/configparser.h
    pathrev: src/external/bsd/nsd/dist/configparser.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.2
    path: src/external/bsd/nsd/dist/zlexer.c
    pathrev: src/external/bsd/nsd/dist/zlexer.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.2
    path: src/external/bsd/nsd/dist/zparser.c
    pathrev: src/external/bsd/nsd/dist/zparser.c@0
    type: deleted
  - new: '0'
    old: 1.1.1.2
    path: src/external/bsd/nsd/dist/zparser.h
    pathrev: src/external/bsd/nsd/dist/zparser.h@0
    type: deleted
  - new: '1.3'
    old: '1.2'
    path: src/external/bsd/nsd/include/config.h
    pathrev: src/external/bsd/nsd/include/config.h@1.3
    type: modified
  id: 20180903T114009Z.e4f827a7377447c2824f4ca7c543d51901c84865
  log: "merge conflicts\n"
  module: src
  subject: 'CVS commit: src/external/bsd/nsd'
  unixtime: '1535974809'
  user: christos