drop Makefile.rej rebase/am left over

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-03-31 18:07:23 +02:00
parent 17b777914a
commit 1efbcdfad0

View File

@ -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 \