Merge branch 'UpdateCodeStyleDocs_Squashed'
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/130ce6ba Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/130ce6ba Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/130ce6ba Branch: refs/heads/master Commit: 130ce6ba8af9bc9c68c7940bbaeb06c7d0f32784 Parents: 49dd3c4 45ef530 Author: Chandni Singh <[email protected]> Authored: Wed Aug 3 17:04:11 2016 -0700 Committer: Chandni Singh <[email protected]> Committed: Wed Aug 3 17:04:11 2016 -0700 ---------------------------------------------------------------------- .../.settings/apex-importorder.importorder | 10 + .../eclipse/.settings/apex-style.xml | 295 +++++++++++++++++++ misc/ide-templates/eclipse/README.md | 8 +- .../eclipse/apex-importorder.importorder | 10 - misc/ide-templates/eclipse/apex-style.xml | 295 ------------------- misc/ide-templates/intellij/README.md | 6 +- misc/ide-templates/netbeans/README.md | 3 +- 7 files changed, 313 insertions(+), 314 deletions(-) ----------------------------------------------------------------------
