From 7ce2c78efeb15b913d85b316d8189cc91176003b Mon Sep 17 00:00:00 2001
From: Arne Babenhauserheide <arne_bab@web.de>
Date: Sat, 14 May 2011 02:18:20 +0200
Subject: removed now obsolete merge-news script.

---
 contributing/web_pages/news/merge-news | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 contributing/web_pages/news/merge-news

diff --git a/contributing/web_pages/news/merge-news b/contributing/web_pages/news/merge-news
deleted file mode 100644
index 33c01b7b..00000000
--- a/contributing/web_pages/news/merge-news
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# merge into master  
-git checkout master  
-git pull --rebase  
-git merge master-news_next
-
-# push master  
-git push origin master
-
-# switch back to master-news_next  
-git checkout master-news_next  
-git pull --rebase
-- 
cgit v1.2.3