From 513492e1bf83fc6cf551bc747294c41e0cc11442 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 11 Jul 2016 16:27:17 +0100
Subject: [PATCH] Change line length as per PR discussion

---
 code_style.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code_style.md b/code_style.md
index 6466b512b4..15404e1599 100644
--- a/code_style.md
+++ b/code_style.md
@@ -22,9 +22,8 @@ number throgh from the original code to the final application.
 General Style
 -------------
 - 4 spaces to indent, for consistency with Matrix Python.
-- Max line width: 79 chars (with flexibility to overflow by a "few chars" if
-  the overflowing content is not semantically significant and avoids an
-  explosion of vertical whitespace).
+- 120 columns per line, but try to keep JavaScript code around the 80 column mark.
+  Inline JSX in particular can be nicer with more columns per line.
 - No trailing whitespace at end of lines.
 - Don't indent empty lines.
 - One newline at the end of the file.