Projects >> twitter-connector >>e367031fad319fafef65ce2f720d0fd301b7f821

Chunk
Conflicting content 
        @Override
        public Object process() throws Exception {
<<<<<<< HEAD
            try {
                return callback.process();
            } catch (Exception e) {
                throw new UnhandledException(e);
            }
=======
            return callback.process();
>>>>>>> 88ccf6d5c047064c89e396dd10894f90bf0e02fb
        }

        @Override
Solution content 
        @Override
        public Object process() throws Exception {
            try {
                return callback.process();
            } catch (Exception e) {
                throw new UnhandledException(e);
            }
        }

        @Override
File
TwitterConnector.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Try statement