Merge ~cjwatson/launchpad:fix-doctest-reformat-headers into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 7d09d2dde939d894bc5ebd9869bac23230206408
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-doctest-reformat-headers
Merge into: launchpad:master
Diff against target: 58 lines (+6/-12)
4 files modified
lib/lp/registry/codesofconduct/1.0.1.txt (+1/-2)
lib/lp/registry/codesofconduct/1.0.txt (+1/-2)
lib/lp/registry/codesofconduct/1.1.txt (+1/-2)
lib/lp/registry/codesofconduct/2.0.txt (+3/-6)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+406177@code.launchpad.net

Commit message

Revert formatting changes to codes of conduct

Description of the change

These aren't doctests.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving trivial test fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/lib/lp/registry/codesofconduct/1.0.1.txt b/lib/lp/registry/codesofconduct/1.0.1.txt
index 46ad260..636573f 100644
--- a/lib/lp/registry/codesofconduct/1.0.1.txt
+++ b/lib/lp/registry/codesofconduct/1.0.1.txt
@@ -1,5 +1,4 @@
1Ubuntu Code of Conduct1= Ubuntu Code of Conduct =
2======================
32
4This Code of Conduct covers your behaviour as a member of the Ubuntu3This Code of Conduct covers your behaviour as a member of the Ubuntu
5Community, in any forum, mailing list, wiki, web site, IRC channel,4Community, in any forum, mailing list, wiki, web site, IRC channel,
diff --git a/lib/lp/registry/codesofconduct/1.0.txt b/lib/lp/registry/codesofconduct/1.0.txt
index 36f2ef7..03a6066 100644
--- a/lib/lp/registry/codesofconduct/1.0.txt
+++ b/lib/lp/registry/codesofconduct/1.0.txt
@@ -1,5 +1,4 @@
1Ubuntu Code of Conduct1= Ubuntu Code of Conduct =
2======================
32
4This Code of Conduct covers your behaviour as a member of the Ubuntu3This Code of Conduct covers your behaviour as a member of the Ubuntu
5Community, in any forum, mailing list, wiki, web site, IRC channel,4Community, in any forum, mailing list, wiki, web site, IRC channel,
diff --git a/lib/lp/registry/codesofconduct/1.1.txt b/lib/lp/registry/codesofconduct/1.1.txt
index 79927ef..18b3cf7 100644
--- a/lib/lp/registry/codesofconduct/1.1.txt
+++ b/lib/lp/registry/codesofconduct/1.1.txt
@@ -1,5 +1,4 @@
1Ubuntu Code of Conduct v1.11= Ubuntu Code of Conduct v1.1 =
2===========================
32
4This Code of Conduct covers our behaviour as members of the Ubuntu3This Code of Conduct covers our behaviour as members of the Ubuntu
5Community, in any forum, mailing list, wiki, web site, IRC channel,4Community, in any forum, mailing list, wiki, web site, IRC channel,
diff --git a/lib/lp/registry/codesofconduct/2.0.txt b/lib/lp/registry/codesofconduct/2.0.txt
index 82acc05..b8c1160 100644
--- a/lib/lp/registry/codesofconduct/2.0.txt
+++ b/lib/lp/registry/codesofconduct/2.0.txt
@@ -1,8 +1,6 @@
1Ubuntu Code of Conduct v2.01= Ubuntu Code of Conduct v2.0 =
2===========================
32
4Community3== Community ==
5---------
64
7Ubuntu is about showing humanity to one another: the word itself5Ubuntu is about showing humanity to one another: the word itself
8captures the spirit of being human.6captures the spirit of being human.
@@ -87,8 +85,7 @@ We strive to:
87 ensure that others can pick up where they left off.85 ensure that others can pick up where they left off.
8886
8987
90Leadership, Authority and Responsibility88== Leadership, Authority and Responsibility ==
91----------------------------------------
9289
93We all lead by example, in debate and in action. We encourage new90We all lead by example, in debate and in action. We encourage new
94participants to feel empowered to lead, to take action, and to91participants to feel empowered to lead, to take action, and to

Subscribers

People subscribed via source and target branches

to status/vote changes: