Skip to content
Permalink
Browse files

.version: Fix conflict

  • Loading branch information...
lukego committed Jan 16, 2019
1 parent 15d6dfe commit 15b1a62dbe9ec2cc9694b0f68cebfc0ed172c5d0
Showing with 0 additions and 4 deletions.
  1. +0 −4 .version
@@ -1,5 +1 @@
<<<<<<< HEAD
2019.01
=======
2018.09.01
>>>>>>> igalia/lwaftr

0 comments on commit 15b1a62

Please sign in to comment.
You can’t perform that action at this time.