Projects >> android-frameworks-base-with-screenshot-tweaks >>bff405f91001237ec94ec64f86fa2370c4509559

Chunk
Conflicting content
 * expected output.
 * 

* Get an instance of this class by calling <<<<<<< HEAD * {@link android.content.Context#getSystemService(java.lang.String)} with an argument * of {@link android.content.Context#STORAGE_SERVICE}. * ======= * {@link android.content.Context#getSystemService(java.lang.String)} with an * argument of {@link android.content.Context#STORAGE_SERVICE}. >>>>>>> d8e8186c887fe47977721315f439465771a96374 */ public class StorageManager

Solution content
 * expected output.
 * 

* Get an instance of this class by calling * {@link android.content.Context#getSystemService(java.lang.String)} with an * argument of {@link android.content.Context#STORAGE_SERVICE}. */ public class StorageManager

File
StorageManager.java
Developer's decision
Version 2
Kind of conflict
Comment