Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- public class MainActivity extends Activity {
- <<<<<<< HEAD
- final String TAG = MainActivity.class.getSimpleName();
- private IabHelper mHelper;
- //...rest of the code
- //after 250 lines of code or so again
- //...
- }
- };
- =======
- private IabHelper mHelper;
- //this field and all next ones, till the end, are repeated
- //then in the end of a source file, there was
- }
- };
- >>>>>>> 4
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement