Reverts faulty git merge
ClosedPublic
Actions

Authored by bekay on Sat, Apr 12, 13:43.

Tags

None

Referenced Files

	F3571855: D25960.1744998078.diff
	Thu, Apr 17, 17:41

	F3566534: D25960.1744995408.diff
	Thu, Apr 17, 16:56

	F3554834: D25960.1744991862.diff
	Thu, Apr 17, 15:57

	F3553510: D25960.1744938529.diff
	Thu, Apr 17, 01:08

	F3552876: D25960.1744910410.diff
	Wed, Apr 16, 17:20

	F3552465: D25960.1744904295.diff
	Wed, Apr 16, 15:38

	F3552408: D25960.1744904220.diff
	Wed, Apr 16, 15:37

	F3531853: D25960.1744884861.diff
	Wed, Apr 16, 10:14

Subscribers

Details

Reviewers

mturdus

Commits

R5:451e5cf8aca0: Reverts faulty git merge

Summary

I have reintroduced removed code by landing R5:3170bc15592efd3b14a6e774f32da6b658ef27b7. The code in question was removed by R5:b1dde4993c81b07f6cbfe30dbaab3bd886c20075. I fix this git merge regression.

Test Plan

Just see how I can't do a proper merge and accept my fix.

Diff Detail

Repository

R5 Diagrams

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bekay created this revision.Sat, Apr 12, 13:43

Herald added subscribers: Cigaryno, Matthew, valerio.bozzolan, tobiaswiese. · View Herald TranscriptSat, Apr 12, 13:43

bekay requested review of this revision.Sat, Apr 12, 13:43

Harbormaster completed remote builds in B1863: Diff 2867.Sat, Apr 12, 13:43

bekay mentioned this in D25612: Use more css and phorge standard elements for application view.Sat, Apr 12, 13:44

mturdus accepted this revision.Sun, Apr 13, 04:59

This revision is now accepted and ready to land.Sun, Apr 13, 04:59

Update

Harbormaster completed remote builds in B1865: Diff 2871.Sun, Apr 13, 09:12

Reset to original diff.

Closed by commit R5:451e5cf8aca0: Reverts faulty git merge. · Explain WhySun, Apr 13, 09:25

This revision was automatically updated to reflect the committed changes.

bekay added a commit: R5:451e5cf8aca0: Reverts faulty git merge.

Revision Contents
Changeset List

Path

Size

src/

controller/

DiagramController.php

11 lines

Diff 2873

View Options

src/controller/DiagramController.php

Reverts faulty git mergeClosedPublicActions