From f7f4a7254071ef029c163b02495edcadf2eb1866 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Tue, 13 Mar 2018 23:55:13 +0300
Subject: [PATCH] Revert "Fix wrong anotations, but tests are still broken"

This reverts commit aa61a0673f6706a35bebb01a5917599bce02e957.
---
 .../nrw/commons/nearby/NearbyAdapterFactoryTest.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java b/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java
index 61848f926..f59ab525d 100644
--- a/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java
+++ b/app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java
@@ -33,8 +33,15 @@ public class NearbyAdapterFactoryTest {
     private static final Place PLACE = new Place("name", Place.Label.AIRPORT,
             "desc", null, new LatLng(38.6270, -90.1994, 0), null);
     private static final Place UNKNOWN_PLACE = new Place("name", Place.Label.UNKNOWN,
+<<<<<<< HEAD
+=======
+<<<<<<< 27ac8ae0d72011bc651affecf7b1da2100ec927e
+            "?", null, new LatLng(39.7392, -104.9903, 0), null);
+    // ^ "?" is a special value for unknown class names from Wikidata query results
+=======
+>>>>>>> directNearbyUploadsNewLocal
             "desc", null, new LatLng(39.7392, -104.9903, 0), null);
-
+>>>>>>> Rename Description to Label to prevent misunderstandings
     private Place clickedPlace;
 
     @Test