Projects >> rstudio >>386ccf0212de4a779d552cc20aee79fee5a59daf

Chunk
Conflicting content
=======
   
   // Injected ----
   private EventBus events_;
<<<<<<< HEAD
   
   @SuppressWarnings("unused")
   private FilesServerOperations files_;
>>>>>>> f1662e85ea44783837075de1b23b5351f7f108c0
}
Solution content
   
   // Injected ----
   private EventBus events_;
}
File
UserCommandManager.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute