UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-13 01:54:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
trwnh 2018-06-19 23:18:47 -05:00 committed by GitHub
parent b271b7065d
commit 82d53d686e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/views/timeline/partial/new-form.blade.php
View file

@ -19,11 +19,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="font-weight-bold text-muted small">Caption</label> <label class="font-weight-bold text-muted small">Caption</label>
<<<<<<< HEAD <input type="text" class="form-control" name="caption" placeholder="Add a caption here" autocomplete="off" maxlength="{{config('pixelfed.max_caption_length')}}">
<input type="text" class="form-control" name="caption" placeholder="Add a caption here" maxlength="{{config('pixelfed.max_caption_length')}}">
=======
<input type="text" class="form-control" name="caption" placeholder="Add a caption here" autocomplete="off">
>>>>>>> dev
<small class="form-text text-muted"> <small class="form-text text-muted">
Max length: {{config('pixelfed.max_caption_length')}} characters. Max length: {{config('pixelfed.max_caption_length')}} characters.
</small> </small>