The dispute between Chinese internet companies Tencent and Qihoo 360 ended Wednesday as Qihoo 360's software and Tencent's popular instant messaging service known as QQ resumed their compatibility with each other, according to a notice on Qihoo 360's official website.
The battle, which began last week when Tencent announced QQ would not function on computers with Qihoo 360's software, triggered heated discussion and dissatisfaction among Chinese internet users as well as related government departments.
Li Yizhong, Minister of Industry and Information Technology, criticized the companies' spat for having a detrimental effect on netizens.
"Entrepreneurs should have basic morals and always ensure the benefit of ordinary consumers, and any market competition should be made under the framework of laws and regulations," said Li during a recent interview.
Li also said an investigation of the dispute was under way, and the findings would be submitted to the State Council.