One day after natural gas distributor Oneok sued social networking site Twitter More about Twitter for trademark infringement, the company said the issue has been resolved and it will drop the lawsuit. Oneok filed the lawsuit in U.S. District Court in Tulsa, saying San Francisco-based Twitter wrongly allowed an anonymous customer the user name "ONEOK."