Projects >> android-arabic-reader >>be1493ab2447d9094145a0e4aeb216fe358d8237

Chunk
Conflicting content 
			public void run() {
				runOnUiThread(new Runnable() {
					public void run() {
<<<<<<< HEAD
						//new TipRunner().start();
						DictionaryUtil.init(FBReader.this);
=======
						new TipRunner().start();
						DictionaryUtil.init(FBReader.this, null);
>>>>>>> c5b050aa5ea8ee7cb98caeee021c1d3cfe07358f
					}
				});
			}
Solution content 
			public void run() {
				runOnUiThread(new Runnable() {
					public void run() {
						//new TipRunner().start();
						DictionaryUtil.init(FBReader.this, null);
					}
				});
			}
File
FBReader.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
			myFBReaderApp.addAction(ActionCode.SET_SCREEN_ORIENTATION_REVERSE_LANDSCAPE, new SetScreenOrientationAction(this, myFBReaderApp, ZLibrary.SCREEN_ORIENTATION_REVERSE_LANDSCAPE));
		}
		myFBReaderApp.addAction(ActionCode.OPEN_WEB_HELP, new OpenWebHelpAction(this, myFBReaderApp));
<<<<<<< HEAD

		ZLAdUtil ad = new ZLAdUtil(this, myRootView);
		ad.start();
=======
		myFBReaderApp.addAction(ActionCode.INSTALL_PLUGINS, new InstallPluginsAction(this, myFBReaderApp));
>>>>>>> c5b050aa5ea8ee7cb98caeee021c1d3cfe07358f
	}

	public ZLAndroidWidget getMainView() {
Solution content 
			myFBReaderApp.addAction(ActionCode.SET_SCREEN_ORIENTATION_REVERSE_LANDSCAPE, new SetScreenOrientationAction(this, myFBReaderApp, ZLibrary.SCREEN_ORIENTATION_REVERSE_LANDSCAPE));
		}
		myFBReaderApp.addAction(ActionCode.OPEN_WEB_HELP, new OpenWebHelpAction(this, myFBReaderApp));
		myFBReaderApp.addAction(ActionCode.INSTALL_PLUGINS, new InstallPluginsAction(this, myFBReaderApp));

		ZLAdUtil ad = new ZLAdUtil(this, myRootView);
		ad.start();
	}

	public ZLAndroidWidget getMainView() {
File
FBReader.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Variable