1 files changed, 25 insertions, 25 deletions
diff --git a/xorg-server/xkeyboard-config/rules/merge.sh b/xorg-server/xkeyboard-config/rules/merge.sh
index b18af7c3d..be06dfc71 100644
--- a/xorg-server/xkeyboard-config/rules/merge.sh
+++ b/xorg-server/xkeyboard-config/rules/merge.sh
@@ -1,25 +1,25 @@
-#!/bin/sh
-
-INDIR=`dirname $0`
-DEST=$1
-shift
-
-if [ -z "$HDR" ]; then
-    HDR="HDR"
-fi
-
-basename=`basename $0`
-echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
-
-for i in $*; do
-  if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
-    echo >> $DEST;
-    read hdr
-    echo "$hdr" >> $DEST
-  elif test -f $i; then
-    cat $i >> $DEST || exit 1
-  else
-    cat $INDIR/$i >> $DEST || exit 1
-  fi
-done < $HDR
-
+#!/bin/sh
+
+INDIR=`dirname $0`
+DEST=$1
+shift
+
+if [ -z "$HDR" ]; then
+    HDR="HDR"
+fi
+
+basename=`basename $0`
+echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
+
+for i in $*; do
+  if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
+    echo >> $DEST;
+    read hdr
+    echo "$hdr" >> $DEST
+  elif test -f $i; then
+    cat $i >> $DEST || exit 1
+  else
+    cat $INDIR/$i >> $DEST || exit 1
+  fi
+done < $HDR
+