mirror of
https://git.proxmox.com/git/pve-manager
synced 2025-07-26 23:03:55 +00:00
drop Makefile.rej rebase/am left over
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
17b777914a
commit
1efbcdfad0
@ -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 \
|
Loading…
Reference in New Issue
Block a user