Implement save/submit functionality in order to resolve conflicts
5f36db921d08Unpublished
Actions

Authored by Andrew-WMDE on Sep 19 2018, 3:10 PM.

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Implement save/submit functionality in order to resolve conflicts

Bug: T195721
Change-Id: I3ecb799fdb790a0dcef347a948d7044b7531ae2e

Committed

WMDE-Fisch

Sep 25 2018, 9:23 AM

Parents

rESCC08dbb1ee711b: Add reset (back) button

Branches

Unknown

Tags

Unknown

References

refs/changes/17/461417/2

ChangeId

I3ecb799fdb790a0dcef347a948d7044b7531ae2e

				Path
	M			includes/SplitTwoColConflict/HtmlSplitConflictView.php
	M			modules/SplitTwoColConflict/ext.TwoColConflict.Split.init.js
	M			modules/SplitTwoColConflict/ext.TwoColConflict.Split.less
	M			tests/selenium/pageobjects/editconflict.page.js
	A			tests/selenium/pageobjects/finishedconflict.page.js
	M			tests/selenium/specs/editmerge.js