merge from 2_4_Release branch

[jalview.git] / src / com / stevesoft / pat / PopRule.java

diff --git a/src/com/stevesoft/pat/PopRule.java b/src/com/stevesoft/pat/PopRule.java
index c8622f3..4a17ab8 100755 (executable)
--- a/src/com/stevesoft/pat/PopRule.java
+++ b/src/com/stevesoft/pat/PopRule.java
@@ -1,23 +1,24 @@
-//\r
-// This software is now distributed according to\r
-// the Lesser Gnu Public License.  Please see\r
-// http://www.gnu.org/copyleft/lesser.txt for\r
-// the details.\r
-//    -- Happy Computing!\r
-//\r
-package com.stevesoft.pat;\r
-\r
-/** Implements substitution rule $POP. See the example\r
- * file <a href="http://javaregex.com/code/trans3.java.html">trans3.html</a>.\r
- */\r
-public class PopRule\r
-    extends SpecialRule\r
-{\r
-  public PopRule()\r
-  {}\r
-\r
-  public String toString1()\r
-  {\r
-    return "${POP}";\r
-  }\r
-}\r
+//
+// This software is now distributed according to
+// the Lesser Gnu Public License.  Please see
+// http://www.gnu.org/copyleft/lesser.txt for
+// the details.
+//    -- Happy Computing!
+//
+package com.stevesoft.pat;
+
+/**
+ * Implements substitution rule $POP. See the example file <a
+ * href="http://javaregex.com/code/trans3.java.html">trans3.html</a>.
+ */
+public class PopRule extends SpecialRule
+{
+  public PopRule()
+  {
+  }
+
+  public String toString1()
+  {
+    return "${POP}";
+  }
+}