Fixed wonky csproj auto-merge
Fixed wonky csproj auto-merge

dbolkensteyn/Nancy,SaveTrees/Nancy,rudygt/Nancy,khellang/Nancy,AIexandr/Nancy,Crisfole/Nancy,phillip-haydon/Nancy,dbabox/Nancy,VQComms/Nancy,MetSystem/Nancy,jonathanfoster/Nancy,EIrwin/Nancy,rudygt/Nancy,damianh/Nancy,anton-gogolev/Nancy,tparnell8/Nancy,tparnell8/Nancy,hitesh97/Nancy,nicklv/Nancy,felipeleusin/Nancy,sloncho/Nancy,danbarua/Nancy,sloncho/Nancy,kekekeks/Nancy,felipeleusin/Nancy,EliotJones/NancyTest,horsdal/Nancy,ccellar/Nancy,Worthaboutapig/Nancy,rudygt/Nancy,Novakov/Nancy,ayoung/Nancy,sadiqhirani/Nancy,damianh/Nancy,guodf/Nancy,wtilton/Nancy,tareq-s/Nancy,jongleur1983/Nancy,Novakov/Nancy,VQComms/Nancy,ccellar/Nancy,vladlopes/Nancy,daniellor/Nancy,sroylance/Nancy,khellang/Nancy,murador/Nancy,murador/Nancy,albertjan/Nancy,dbolkensteyn/Nancy,murador/Nancy,Novakov/Nancy,EIrwin/Nancy,wtilton/Nancy,horsdal/Nancy,ccellar/Nancy,jeff-pang/Nancy,jongleur1983/Nancy,tsdl2013/Nancy,dbabox/Nancy,rudygt/Nancy,Crisfole/Nancy,cgourlay/Nancy,VQComms/Nancy,anton-gogolev/Nancy,jchannon/Nancy,NancyFx/Nancy,phillip-haydon/Nancy,AIexandr/Nancy,SaveTrees/Nancy,wtilton/Nancy,ayoung/Nancy,JoeStead/Nancy,malikdiarra/Nancy,lijunle/Nancy,AlexPuiu/Nancy,daniellor/Nancy,phillip-haydon/Nancy,SaveTrees/Nancy,Novakov/Nancy,jeff-pang/Nancy,JoeStead/Nancy,ccellar/Nancy,asbjornu/Nancy,wtilton/Nancy,cgourlay/Nancy,jchannon/Nancy,MetSystem/Nancy,tsdl2013/Nancy,malikdiarra/Nancy,adamhathcock/Nancy,vladlopes/Nancy,danbarua/Nancy,albertjan/Nancy,AlexPuiu/Nancy,AcklenAvenue/Nancy,khellang/Nancy,xt0rted/Nancy,EliotJones/NancyTest,duszekmestre/Nancy,ToJans/Nancy,duszekmestre/Nancy,jchannon/Nancy,kekekeks/Nancy,fly19890211/Nancy,EliotJones/NancyTest,duszekmestre/Nancy,murador/Nancy,JoeStead/Nancy,sloncho/Nancy,joebuschmann/Nancy,MetSystem/Nancy,tsdl2013/Nancy,SaveTrees/Nancy,dbolkensteyn/Nancy,albertjan/Nancy,AcklenAvenue/Nancy,xt0rted/Nancy,joebuschmann/Nancy,blairconrad/Nancy,asbjornu/Nancy,adamhathcock/Nancy,jeff-pang/Nancy,thecodejunkie/Nancy,jeff-pang/Nancy,charleypeng/Nancy,asbjornu/Nancy,blairconrad/Nancy,damianh/Nancy,JoeStead/Nancy,VQComms/Nancy,AcklenAvenue/Nancy,jchannon/Nancy,xt0rted/Nancy,daniellor/Nancy,jchannon/Nancy,davidallyoung/Nancy,daniellor/Nancy,charleypeng/Nancy,duszekmestre/Nancy,nicklv/Nancy,malikdiarra/Nancy,dbabox/Nancy,davidallyoung/Nancy,AcklenAvenue/Nancy,grumpydev/Nancy,davidallyoung/Nancy,jmptrader/Nancy,thecodejunkie/Nancy,tareq-s/Nancy,sroylance/Nancy,khellang/Nancy,malikdiarra/Nancy,xt0rted/Nancy,adamhathcock/Nancy,danbarua/Nancy,thecodejunkie/Nancy,thecodejunkie/Nancy,joebuschmann/Nancy,sloncho/Nancy,hitesh97/Nancy,albertjan/Nancy,blairconrad/Nancy,tsdl2013/Nancy,tareq-s/Nancy,ayoung/Nancy,joebuschmann/Nancy,hitesh97/Nancy,fly19890211/Nancy,Worthaboutapig/Nancy,guodf/Nancy,anton-gogolev/Nancy,sroylance/Nancy,cgourlay/Nancy,horsdal/Nancy,AlexPuiu/Nancy,tareq-s/Nancy,fly19890211/Nancy,asbjornu/Nancy,NancyFx/Nancy,MetSystem/Nancy,jmptrader/Nancy,AIexandr/Nancy,AIexandr/Nancy,nicklv/Nancy,tparnell8/Nancy,jonathanfoster/Nancy,davidallyoung/Nancy,ayoung/Nancy,nicklv/Nancy,guodf/Nancy,Worthaboutapig/Nancy,lijunle/Nancy,sadiqhirani/Nancy,jmptrader/Nancy,tparnell8/Nancy,sadiqhirani/Nancy,jmptrader/Nancy,hitesh97/Nancy,adamhathcock/Nancy,vladlopes/Nancy,phillip-haydon/Nancy,EIrwin/Nancy,charleypeng/Nancy,EIrwin/Nancy,vladlopes/Nancy,asbjornu/Nancy,Worthaboutapig/Nancy,sroylance/Nancy,blairconrad/Nancy,sadiqhirani/Nancy,ToJans/Nancy,kekekeks/Nancy,VQComms/Nancy,anton-gogolev/Nancy,jonathanfoster/Nancy,EliotJones/NancyTest,cgourlay/Nancy,ToJans/Nancy,dbabox/Nancy,AlexPuiu/Nancy,fly19890211/Nancy,felipeleusin/Nancy,charleypeng/Nancy,felipeleusin/Nancy,dbolkensteyn/Nancy,grumpydev/Nancy,NancyFx/Nancy,horsdal/Nancy,lijunle/Nancy,grumpydev/Nancy,AIexandr/Nancy,jongleur1983/Nancy,lijunle/Nancy,NancyFx/Nancy,Crisfole/Nancy,davidallyoung/Nancy,jongleur1983/Nancy,grumpydev/Nancy,charleypeng/Nancy,danbarua/Nancy,guodf/Nancy,jonathanfoster/Nancy