BIND 10 #2945: doxygen warning cleanups

[BIND 10 Development]

#2945: doxygen warning cleanups
-------------------------------------+-------------------------------------
            Reporter:  jreed         |                        Owner:
                Type:  defect        |  UnAssigned
            Priority:  medium        |                       Status:
           Component:  Unclassified  |  reviewing
            Keywords:                |                    Milestone:
           Sensitive:  0             |  Sprint-20131001
         Sub-Project:  Core          |                   Resolution:
Estimated Difficulty:  private       |                 CVSS Scoring:
  branch                             |              Defect Severity:  N/A
         Total Hours:  0             |  Feature Depending on Ticket:
                                     |          Add Hours to Ticket:  0
                                     |                    Internal?:  0
-------------------------------------+-------------------------------------

Comment (by muks):

 The merge conflict fix looks fine.

 You can see the merge conflict fix just like any other commit by using
 `git show` on the merge commit.

-- 
Ticket URL: <http://bind10.isc.org/ticket/2945#comment:12>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development