upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 17:41:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

address merge error

Browse source
This commit is contained in:
Mark Andrews 2015-06-18 07:54:33 +10:00
parent e6b7e545b5
commit 80d7a03384
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
win32utils/legacy/BINDBuild.dsw.in
View file

@ -1113,8 +1113,6 @@ Package=<4>
###############################################################################
<<<<<<< HEAD:win32utils/BINDBuild.dsw
=======
Project: "timer_test"="..\..\bin\tests\win32\timer_test.dsp" - Package Owner=<4>
Package=<5>
@ -1131,7 +1129,6 @@ Package=<4>
@END XTESTS
###############################################################################
>>>>>>> c3c8823... 3681. [port] Update the Windows build system to support feature:win32utils/legacy/BINDBuild.dsw.in
Global:
Package=<5>