Projects information

Chunk

Conflicting content
CookieSyncManager.createInstance(this); // Load bootstrap <<<<<<< HEAD super.loadUrl(BOOTSTRAP_START_PAGE); ======= super.loadUrl(getStartPageUrl()); >>>>>>> c1c3fff693274711b93bbfd96246e4bf79940f74 // Periodic auto-refresh - scheduled in onResume periodicAutoRefreshHandler = new Handler(); periodicAutoRefresher = new PeriodicAutoRefresher();

Conflicting content

        CookieSyncManager.createInstance(this);

        // Load bootstrap
<<<<<<< HEAD
        super.loadUrl(BOOTSTRAP_START_PAGE);

=======
        super.loadUrl(getStartPageUrl());
        
>>>>>>> c1c3fff693274711b93bbfd96246e4bf79940f74
        // Periodic auto-refresh - scheduled in onResume
        periodicAutoRefreshHandler = new Handler();
        periodicAutoRefresher = new PeriodicAutoRefresher();

Solution content
CookieSyncManager.createInstance(this); // Load bootstrap super.loadUrl(getStartPageUrl()); // Periodic auto-refresh - scheduled in onResume periodicAutoRefreshHandler = new Handler(); periodicAutoRefresher = new PeriodicAutoRefresher();

Solution content

        CookieSyncManager.createInstance(this);

        // Load bootstrap
        super.loadUrl(getStartPageUrl());

        // Periodic auto-refresh - scheduled in onResume
        periodicAutoRefreshHandler = new Handler();
        periodicAutoRefresher = new PeriodicAutoRefresher();

File
SalesforceDroidGapActivity.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content
periodicAutoRefreshHandler = new Handler(); periodicAutoRefresher = new PeriodicAutoRefresher(); } <<<<<<< HEAD ======= /** Returns the start page url for the application. * Must be overridden if you want a different start page. * @return Start page url of the app. */ public String getStartPageUrl() { return BOOTSTRAP_START_PAGE; } >>>>>>> c1c3fff693274711b93bbfd96246e4bf79940f74 @Override public void init() { super.init();

Conflicting content

        periodicAutoRefreshHandler = new Handler();
        periodicAutoRefresher = new PeriodicAutoRefresher();
    }
<<<<<<< HEAD

=======
    
    /** Returns the start page url for the application. 
     * Must be overridden if you want a different start page.
     * @return Start page url of the app.
     */
    public String getStartPageUrl() {
    	return BOOTSTRAP_START_PAGE;
    }
    
>>>>>>> c1c3fff693274711b93bbfd96246e4bf79940f74
    @Override
    public void init() {
        super.init();

Solution content
periodicAutoRefreshHandler = new Handler(); periodicAutoRefresher = new PeriodicAutoRefresher(); } /** Returns the start page url for the application. * Must be overridden if you want a different start page. * @return Start page url of the app. */ public String getStartPageUrl() { return BOOTSTRAP_START_PAGE; } @Override public void init() { super.init();

Solution content

        periodicAutoRefreshHandler = new Handler();
        periodicAutoRefresher = new PeriodicAutoRefresher();
    }

    /** Returns the start page url for the application. 
     * Must be overridden if you want a different start page.
     * @return Start page url of the app.
     */
    public String getStartPageUrl() {
    	return BOOTSTRAP_START_PAGE;
    }
    
    @Override
    public void init() {
        super.init();

File
SalesforceDroidGapActivity.java

Developer's decision
Version 2

Kind of conflict
Comment
Method declaration

Projects >> SalesforceMobileSDK-Android >>bc2f0dab2dbb89a31dbec80f992c870d78e57269