diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
| commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
| download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java')
| -rw-r--r-- | platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java index 7aa83adfd275..1de4d4a96357 100644 --- a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java +++ b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java @@ -66,7 +66,7 @@ public abstract class DiffPreviewProvider { " long value;\n" + "\n" + " void foo() {\n" + - " // Left changes\n" + + " // Right changes\n" + " }\n" + "\n" + " void removedFromLeft() {}\n" + |