Oops again

This commit is contained in:
Alejandro Serrano 2020-03-06 12:45:47 +01:00
parent 7815520b63
commit cc6d7998a8
No known key found for this signature in database
GPG Key ID: A04B82DC1AD554C3

View File

@ -1,8 +1,4 @@
<<<<<<< HEAD
resolver: nightly-2020-02-17
=======
resolver: nightly-2020-02-28
>>>>>>> master
resolver: nightly-2020-03-04
allow-newer: true
packages: