Merge branch 'master' into master

ornl-epics · Jun 15, 2017 · 5aac2cd · 5aac2cd
2 parents bf6292e + 7059494
commit 5aac2cd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code_format.xml b/code_format.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="12">
-<profile kind="CodeFormatterProfile" name="Etherip_from_kasemir" version="12">
+<profile kind="CodeFormatterProfile" name="Etherip_Take1" version="12">
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
@@ -930,4 +930,4 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
 </profile>
-</profiles>
+</profiles>