Pixelfed/PixelDroid-App-Android
1
0
Fork 0
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid synced 2024-12-26 15:04:04 +01:00
Code Issues Releases Wiki Activity

fixed poped modifications merge conflict

Browse Source
This commit is contained in:
Andrea Clement 2020-05-19 21:54:49 +02:00
parent 7060881aea
commit be4b9e748f
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/h/pixeldroid/PostCreationActivity.kt
View File

@ -42,13 +42,10 @@ class PostCreationActivity : AppCompatActivity() {
private lateinit var pixelfedAPI: PixelfedAPI
private lateinit var pictureFrame: ImageView
private lateinit var image: File
<<<<<<< Updated upstream
private var user: UserDatabaseEntity? = null
private var maxLength: Int = Instance.DEFAULT_MAX_TOOT_CHARS
=======
private var isSensitive = false
>>>>>>> Stashed changes
private var description: String = ""