Projects >> PageTurner >>e5510f9d4542a2255e102351ba000b2b29281f5c

Chunk
Conflicting content 
				
				Link searchLink = feed.findByRel(AtomConstants.REL_SEARCH);
				
<<<<<<< HEAD
				URL mBaseUrl = new URL(baseUrl);
				URL mSearchUrl = new URL(mBaseUrl, searchLink.getHref());
				searchLink.setHref(mSearchUrl.toString());
				
				if ( searchLink != null && 
						AtomConstants.TYPE_OPENSEARCH.equals(searchLink.getType())) {
					HttpGet searchGet = new HttpGet( mSearchUrl.toString() );
					HttpResponse searchResponse = client.execute(searchGet);
					SearchDescription desc = Nucular.readOpenSearchFromStream( searchResponse.getEntity().getContent() );
=======
				if ( searchLink != null ) {
					URL mBaseUrl = new URL(baseUrl);
					URL mSearchUrl = new URL(mBaseUrl, searchLink.getHref());
					searchLink.setHref(mSearchUrl.toString());

					if (  AtomConstants.TYPE_OPENSEARCH.equals(searchLink.getType())) {
						HttpGet searchGet = new HttpGet( searchLink.getHref() );
					
						HttpResponse searchResponse = client.execute(searchGet);
						SearchDescription desc = Nucular.readOpenSearchFromStream( searchResponse.getEntity().getContent() );
>>>>>>> a0efccc86eaefc06d2edfdf24236ec3273287acd
					
						if ( desc.getSearchLink() != null ) {
							searchLink.setType(AtomConstants.TYPE_ATOM);
Solution content 
				
				Link searchLink = feed.findByRel(AtomConstants.REL_SEARCH);
				
				if ( searchLink != null ) {
					URL mBaseUrl = new URL(baseUrl);
					URL mSearchUrl = new URL(mBaseUrl, searchLink.getHref());
					searchLink.setHref(mSearchUrl.toString());

					if (  AtomConstants.TYPE_OPENSEARCH.equals(searchLink.getType())) {
						HttpGet searchGet = new HttpGet( searchLink.getHref() );
					
						HttpResponse searchResponse = client.execute(searchGet);
						SearchDescription desc = Nucular.readOpenSearchFromStream( searchResponse.getEntity().getContent() );
					
						if ( desc.getSearchLink() != null ) {
							searchLink.setType(AtomConstants.TYPE_ATOM);
File
CatalogActivity.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable