From 1efbcdfad0bc1c45bcc3e7fd28d351059e95e768 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 31 Mar 2020 18:07:23 +0200 Subject: [PATCH] drop Makefile.rej rebase/am left over Signed-off-by: Thomas Lamprecht --- www/manager6/Makefile.rej | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 www/manager6/Makefile.rej diff --git a/www/manager6/Makefile.rej b/www/manager6/Makefile.rej deleted file mode 100644 index e8f2f84d..00000000 --- a/www/manager6/Makefile.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/www/manager6/Makefile b/www/manager6/Makefile (rejected hunks) -@@ -66,6 +66,7 @@ JSSRC= \ - form/CalendarEvent.js \ - form/CephPoolSelector.js \ - form/PermPathSelector.js \ -+ form/SDNTransportSelector.js \ - dc/Tasks.js \ - dc/Log.js \ - panel/StatusPanel.js \