sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove leftover merge conflict line

Browse Source
This commit is contained in:
A.Unger
2020-05-27 11:14:06 +02:00
parent c4466850ce
commit 7a91b6261a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/micro/runtime/runtime.go
+1 -1
View File
@@ -42,7 +42,7 @@ var (
"reva-auth-basic",
"reva-auth-bearer",
"reva-sharing",
//"reva-storage-root",
// "reva-storage-root",
"reva-storage-home",
"reva-storage-public-link",
"reva-storage-home-data",