From 64a9540829cbfc353ce648b6d47bc80f42aa3602 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Mon, 9 Feb 2015 09:15:56 -0500
Subject: [PATCH] [1.8.x] Added isort config to ease resolving merge conflicts.

---
 setup.cfg | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 28353841d8a..e897d28e2bf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,6 +7,13 @@ exclude=build,.git,./django/utils/dictconfig.py,./django/utils/unittest.py,./dja
 ignore=E123,E128,E501,W601
 max-line-length = 119
 
+[isort]
+combine_as_imports = true
+default_section = THIRDPARTY
+include_trailing_comma = true
+known_first_party = django
+multi_line_output = 5
+
 [metadata]
 license-file = LICENSE