From b03a71eea815e20bfa0c9dd0833ce8d1ebff3f62 Mon Sep 17 00:00:00 2001
From: Kate Stone <katherine.stone@apple.com>
Date: Fri, 19 Aug 2016 20:46:37 +0000
Subject: [PATCH] Reverted premature changes to .clang-format

llvm-svn: 279316
---
 lldb/.clang-format                           | 8 ++++++++
 lldb/packages/Python/lldbsuite/.clang-format | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 lldb/packages/Python/lldbsuite/.clang-format

diff --git a/lldb/.clang-format b/lldb/.clang-format
index 9b3aa8b..c698dc5 100644
--- a/lldb/.clang-format
+++ b/lldb/.clang-format
@@ -1 +1,9 @@
 BasedOnStyle: LLVM
+IndentWidth:     4
+ColumnLimit:     120
+BreakBeforeBraces: Allman
+AlwaysBreakAfterReturnType: All
+AllowShortFunctionsOnASingleLine: Inline
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+IndentCaseLabels: true
+AccessModifierOffset: -4
diff --git a/lldb/packages/Python/lldbsuite/.clang-format b/lldb/packages/Python/lldbsuite/.clang-format
deleted file mode 100644
index 7de7a51..0000000
--- a/lldb/packages/Python/lldbsuite/.clang-format
+++ /dev/null
@@ -1,4 +0,0 @@
-DisableFormat: true
-
-# Disabling formatting doesn't implicitly disable include sorting
-SortIncludes: false
-- 
2.7.4