Projects >> twitstreet >>0881b48e42bc178af9ed34357f57b48c61c78b4a

Chunk
Conflicting content 
				userMgr.updateRankingHistory(false);
				logger.info("Rank history update - end. ");

<<<<<<< HEAD
					logger.info("Mention trendy stock - begin.");
					mentionTopGrossingStocks();
					logger.info("Mention trendy stock - end. ");
					
					
					logger.info("Remove old records - begin.");
					stockMgr.removeOldRecords(60 * 24);
					logger.info("Remove old records - end.");

				}
=======
				logger.info("Mention trendy stock - begin.");
				mentionTopGrossingStocks();
				logger.info("Mention trendy stock - end. ");

				logger.info("Remove old records - begin.");
				twitstreetAnnouncer.removeOldRecords(60 * 24);
				logger.info("Remove old records - end.");

>>>>>>> aaadfd7e3e5c71684ba701a3eff5e68b4ba13941
				counter ++;
				logger.info("\n\n******************** Stock Update Task - End ****************************\n\n");
			} catch (Throwable ex) {
Solution content 
				userMgr.updateRankingHistory(false);
				logger.info("Rank history update - end. ");

				logger.info("Mention trendy stock - begin.");
				mentionTopGrossingStocks();
				logger.info("Mention trendy stock - end. ");

				logger.info("Mention trendy stock - begin.");
				mentionTopGrossingStocks();
				logger.info("Mention trendy stock - end. ");

				logger.info("Remove old records - begin.");
				stockMgr.removeOldRecords(60 * 24);
				logger.info("Remove old records - end.");

				counter++;
				logger.info("\n\n******************** Stock Update Task - End ****************************\n\n");
			} catch (Throwable ex) {
File
StockUpdateTask.java
Developer's decision
Combination
Kind of conflict
Method invocation