Projects >> twitter-2-weibo >>0919511e292ac27269b6c10663fa69b3d5d1d9b4

Chunk
Conflicting content 
                            throw new RuntimeException(e);
                        }
                    }
<<<<<<< HEAD
=======
                    user.setLatestId(status.getId()); // still update the latestId to skip
>>>>>>> a60504c4dc17a2ebe626d2a92c1442d1fcf4a9ce
                    Thread.sleep(500);
                }
            }
Solution content 
                            throw new RuntimeException(e);
                        }
                    }
                }
            }
File
Twitter2Weibo.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation