echarlaix HF Staff commited on
Commit
e71e92b
·
1 Parent(s): ac237d9

fix conflicts

Browse files
Files changed (2) hide show
  1. config.json +0 -4
  2. generation_config.json +0 -4
config.json CHANGED
@@ -54,11 +54,7 @@
54
  "time_step_limit": null,
55
  "time_step_max": 0.1,
56
  "time_step_min": 0.001,
57
- <<<<<<< Updated upstream
58
  "transformers_version": "5.0.0",
59
- =======
60
- "transformers_version": "4.57.6",
61
- >>>>>>> Stashed changes
62
  "use_cache": true,
63
  "use_conv_bias": true,
64
  "use_long_context": false,
 
54
  "time_step_limit": null,
55
  "time_step_max": 0.1,
56
  "time_step_min": 0.001,
 
57
  "transformers_version": "5.0.0",
 
 
 
58
  "use_cache": true,
59
  "use_conv_bias": true,
60
  "use_long_context": false,
generation_config.json CHANGED
@@ -3,9 +3,5 @@
3
  "bos_token_id": 1,
4
  "eos_token_id": 2,
5
  "pad_token_id": 0,
6
- <<<<<<< Updated upstream
7
  "transformers_version": "5.0.0"
8
- =======
9
- "transformers_version": "4.57.6"
10
- >>>>>>> Stashed changes
11
  }
 
3
  "bos_token_id": 1,
4
  "eos_token_id": 2,
5
  "pad_token_id": 0,
 
6
  "transformers_version": "5.0.0"
 
 
 
7
  }