search

google-developer-training / android-kotlin-fundamentals-starter-apps

android-kotlin-fundamentals-starter-apps
Other
1.1k stars 3.32k forks source link

GDGFinder app has `drawer_view.xml` with conflict symbols #2

Closed shadowsheep1 closed 4 years ago

shadowsheep1 commented 5 years ago

image

edgarjc commented 4 years ago

Everything above line 5 needs to be deleted from the file. Here's what the code should look like:

<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:title="@string/gdg_search" android:id="@+id/gdg_search"
    />
    <item android:title="@string/gdg_apply" android:id="@+id/gdg_apply"/>
</menu>
GeneAndGoogle commented 4 years ago

Fixed.