Halaman utama Jelajahi Bantuan
Masuk
Operations
/
joystream
3
0
Fork 0
Berkas Masalah 0 Permintaan Tarik 0 Wiki
Jelajahi Sumber

fix broken Cargo.lock after merge conflic resolution

Mokhtar Naamani 5 tahun lalu
induk
387475771a
melakukan
7461759207
1 mengubah file dengan 0 tambahan dan 4 penghapusan
Tampilan Split Tampilkan Statistik Diff
  1. 0 4
      Cargo.lock

+ 0 - 4
Cargo.lock
Tampilan Berkas 

@@ -1554,11 +1554,7 @@ dependencies = [
 
 
 [[package]]
 
 name = "joystream-node"
 
-<<<<<<< HEAD
 
 version = "2.1.5"
 
-=======
 
-version = "2.1.4"
 
->>>>>>> development
 
 dependencies = [
 
  "ctrlc",
 
  "derive_more 0.14.1",