| Chunk |
|---|
| Conflicting content |
|---|
logger.info("Rank history update - end. ");
try{
<<<<<<< HEAD
TrendyStock ts = stockMgr.getTopGrossingStocks(24).get(0);
=======
TrendyStock ts = stockMgr.getTopGrossingStocksByServer(2).get(0);
>>>>>>> c4390fa4199fa5251498595cbd2642ae875098a8
twitstreetAnnouncer.mention(ts, ts.getAnnouncement(ts.getLanguage()));
twitstreetAnnouncer.mention(ts,ts.getAnnouncementStockDetail(ts.getLanguage())+ " http://www.twitstreet.com/#stock-"+String.valueOf(ts.getId()));
} |
| Solution content |
|---|
logger.info("Rank history update - end. ");
try{
TrendyStock ts = stockMgr.getTopGrossingStocks(24).get(0);
twitstreetAnnouncer.mention(ts, ts.getAnnouncement(ts.getLanguage()));
twitstreetAnnouncer.mention(ts,ts.getAnnouncementStockDetail(ts.getLanguage())+ " http://www.twitstreet.com/#stock-"+String.valueOf(ts.getId()));
} |
| File |
|---|
| StockUpdateTask.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
.getAnnouncerAccessSecret()));
try {
<<<<<<< HEAD
twitter.updateStatus("@" + stock.getName() + " " + message );
=======
twitter.updateStatus("@" + stock.getName() + " " + message
+ " #twitstreet");
>>>>>>> c4390fa4199fa5251498595cbd2642ae875098a8
} catch (TwitterException e) {
logger.error("sendMessage:" + stock.getName() + " " + message);
} |
| Solution content |
|---|
.getAnnouncerAccessSecret()));
try {
twitter.updateStatus("@" + stock.getName() + " " + message );
} catch (TwitterException e) {
logger.error("sendMessage:" + stock.getName() + " " + message);
} |
| File |
|---|
| TwitstreetAnnouncerImpl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |