Fix mistake made in merge conflict re: options.dataAdapterConfig
Fix mistake made in merge conflict re: options.dataAdapterConfig

kball/rendr,0111001101111010/rendr,is00hcw/rendr,bigethan/rendr,yhagio/rendr,sarchila/rendr,CristinaFoltea/rendr,rendrjs/rendr,eGood/rendr0.5,SNASW/rendr,alexindigo/rendr,modulexcite/rendr