Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

solve merge conflict

Browse source
This commit is contained in:
Christian Schabesberger 2018-02-14 21:06:20 +01:00
commit 8adca3725d
8 changed files with 132 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/values/strings.xml
View file

@ -410,4 +410,8 @@
<string name="normal_caption_font_size">Normal Font</string>
<string name="larger_caption_font_size">Larger Font</string>
<!-- Debug Only -->
<string name="toggle_leak_canary">Monitor Leaks</string>
<string name="enable_leak_canary_notice">Memory leak monitoring enabled, app may become unresponsive when heap dumping</string>
<string name="disable_leak_canary_notice">Memory leak monitoring disabled</string>
</resources>