| Chunk |
|---|
| Conflicting content |
|---|
import winterwell.jtwitter.TwitterException.E401;
import winterwell.jtwitter.TwitterException.E403;
import winterwell.jtwitter.TwitterException.SuspendedUser;
<<<<<<< HEAD
import winterwell.utils.reporting.Log;
=======
import winterwell.jtwitter.TwitterException.Unexplained;
>>>>>>> 7a495676005daddb2aa0cb461c8e8ffae93b0583
/**
* Java wrapper for the Twitter API version {@value #version} |
| Solution content |
|---|
import winterwell.jtwitter.TwitterException.E401;
import winterwell.jtwitter.TwitterException.E403;
import winterwell.jtwitter.TwitterException.SuspendedUser;
import winterwell.utils.reporting.Log;
/**
* Java wrapper for the Twitter API version {@value #version} |
| File |
|---|
| Twitter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |