solve conflict
This commit is contained in:
		
						commit
						fa99ee240c
					
				
							
								
								
									
										35
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										35
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							| @ -1,19 +1,33 @@ | ||||
| *.7z filter=lfs diff=lfs merge=lfs -text | ||||
| *.arrow filter=lfs diff=lfs merge=lfs -text | ||||
| *.bin filter=lfs diff=lfs merge=lfs -text | ||||
| <<<<<<< HEAD | ||||
| *.bin.* filter=lfs diff=lfs merge=lfs -text | ||||
| *.bz2 filter=lfs diff=lfs merge=lfs -text | ||||
| ======= | ||||
| *.bz2 filter=lfs diff=lfs merge=lfs -text | ||||
| *.ckpt filter=lfs diff=lfs merge=lfs -text | ||||
| >>>>>>> 7ae8a2588bdb1491d21d290081b1b7a4c586a638 | ||||
| *.ftz filter=lfs diff=lfs merge=lfs -text | ||||
| *.gz filter=lfs diff=lfs merge=lfs -text | ||||
| *.h5 filter=lfs diff=lfs merge=lfs -text | ||||
| *.joblib filter=lfs diff=lfs merge=lfs -text | ||||
| *.lfs.* filter=lfs diff=lfs merge=lfs -text | ||||
| <<<<<<< HEAD | ||||
| *.model filter=lfs diff=lfs merge=lfs -text | ||||
| *.msgpack filter=lfs diff=lfs merge=lfs -text | ||||
| ======= | ||||
| *.mlmodel filter=lfs diff=lfs merge=lfs -text | ||||
| *.model filter=lfs diff=lfs merge=lfs -text | ||||
| *.msgpack filter=lfs diff=lfs merge=lfs -text | ||||
| *.npy filter=lfs diff=lfs merge=lfs -text | ||||
| *.npz filter=lfs diff=lfs merge=lfs -text | ||||
| >>>>>>> 7ae8a2588bdb1491d21d290081b1b7a4c586a638 | ||||
| *.onnx filter=lfs diff=lfs merge=lfs -text | ||||
| *.ot filter=lfs diff=lfs merge=lfs -text | ||||
| *.parquet filter=lfs diff=lfs merge=lfs -text | ||||
| *.pb filter=lfs diff=lfs merge=lfs -text | ||||
| <<<<<<< HEAD | ||||
| *.pt filter=lfs diff=lfs merge=lfs -text | ||||
| *.pth filter=lfs diff=lfs merge=lfs -text | ||||
| *.rar filter=lfs diff=lfs merge=lfs -text | ||||
| @ -47,4 +61,23 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text | ||||
| *tfevents* filter=lfs diff=lfs merge=lfs -text | ||||
| 
 | ||||
| merges.txt filter=lfs diff=lfs merge=lfs -text | ||||
| vocab.json filter=lfs diff=lfs merge=lfs -text | ||||
| vocab.json filter=lfs diff=lfs merge=lfs -text | ||||
| ======= | ||||
| *.pickle filter=lfs diff=lfs merge=lfs -text | ||||
| *.pkl filter=lfs diff=lfs merge=lfs -text | ||||
| *.pt filter=lfs diff=lfs merge=lfs -text | ||||
| *.pth filter=lfs diff=lfs merge=lfs -text | ||||
| *.rar filter=lfs diff=lfs merge=lfs -text | ||||
| *.safetensors filter=lfs diff=lfs merge=lfs -text | ||||
| saved_model/**/* filter=lfs diff=lfs merge=lfs -text | ||||
| *.tar.* filter=lfs diff=lfs merge=lfs -text | ||||
| *.tar filter=lfs diff=lfs merge=lfs -text | ||||
| *.tflite filter=lfs diff=lfs merge=lfs -text | ||||
| *.tgz filter=lfs diff=lfs merge=lfs -text | ||||
| *.wasm filter=lfs diff=lfs merge=lfs -text | ||||
| *.xz filter=lfs diff=lfs merge=lfs -text | ||||
| *.zip filter=lfs diff=lfs merge=lfs -text | ||||
| *.zst filter=lfs diff=lfs merge=lfs -text | ||||
| *tfevents* filter=lfs diff=lfs merge=lfs -text | ||||
| *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text | ||||
| >>>>>>> 7ae8a2588bdb1491d21d290081b1b7a4c586a638 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 zhufq
						zhufq