abinit / pseudo_dojo

Python framework for generating and validating pseudo potentials
http://www.pseudo-dojo.org/
Other
41 stars 35 forks source link

regeneration of upf _r #61

Closed setten closed 7 years ago

gmatteo commented 7 years ago

There are conflicts in the djrepo file due to the hints

<<<<<<< HEAD
"hints": {
"high": {
"ecut": 37.0
}, 
"low": {
"ecut": 29.0
}, 
"normal": {
"ecut": 33.0
}
}, 
"md5": "725dab9662c1d38bf57215081c9e3b95", 
=======
"md5": "701cf02858a6ed62904dbbc150084e61", 
>>>>>>> 31e1864eee08cfb466e665ab091aac4e9cdb3910

You have regenerated the pseudos but you branch was not in synch with master. To solve the conflicts: