From 181529089411d6f55333b22d169e87d3f5137eb5 Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Thu, 30 Jun 2011 12:03:31 -0400
Subject: [PATCH] Remove Microsoft Line endings. Some files have mixed line endings that make Subverison unhappy
---
server/conf/nginx_rewrites.conf.master | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/conf/nginx_rewrites.conf.master b/server/conf/nginx_rewrites.conf.master
index b5d2ad5..c9080a7 100644
--- a/server/conf/nginx_rewrites.conf.master
+++ b/server/conf/nginx_rewrites.conf.master
@@ -1,9 +1,9 @@
-server {
- listen 80 default_server;
- listen 443 default_server;
- server_name _;
- include /etc/nginx/proxy.conf;
- <tmpl_loop name="nginx_rewrite_rules">
- rewrite ^{tmpl_var name="rewrite_url_src"} {tmpl_var name="rewrite_url_dst"};
- </tmpl_loop>
-}
+server {
+ listen 80 default_server;
+ listen 443 default_server;
+ server_name _;
+ include /etc/nginx/proxy.conf;
+ <tmpl_loop name="nginx_rewrite_rules">
+ rewrite ^{tmpl_var name="rewrite_url_src"} {tmpl_var name="rewrite_url_dst"};
+ </tmpl_loop>
+}
--
Gitblit v1.9.1