Skip to content

Commit 0335427

Browse files
committed
Fix merge conflict
Change-Id: Ie76fca6965f682e8f8e646c8d329316c6973c32c
2 parents ca64b9d + eb66d52 commit 0335427

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

samples-android/ButtonClicker/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
<string name="app_name">ButtonClicker</string>
44
<string name="app_id">REPLACE_ME</string>
55

6-
</resources>
6+
</resources>

0 commit comments

Comments
 (0)