Fix merge conflict. allow-ranking 6/head
authorAnt Zucaro <azucaro@gmail.com>
Sun, 17 Sep 2017 15:27:39 +0000 (11:27 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sun, 17 Sep 2017 15:27:39 +0000 (11:27 -0400)
commit46766ab3e13c8265330047224d6bb823d5d4aaf1
tree70f8363d8ff97641fc35837e544ea5ebf150f13f
parent86a5e102197ad8750b97705cda6b4107b371ebe4
parent4d45a11b27133f1f2c2c1ea2f0ca49cf04649c20
Fix merge conflict.