forked from friendica/friendica-addons
7ab2c715a4
resolved several conflicts and mibbit was not removed Conflicts: ljpost/ljpost.css ljpost/ljpost.php
33 lines
560 B
CSS
Executable file
33 lines
560 B
CSS
Executable file
|
|
#ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label {
|
|
<<<<<<< HEAD
|
|
float: left;
|
|
width: 200px;
|
|
margin-top: 10px;
|
|
}
|
|
|
|
#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
|
|
float: left;
|
|
margin-top: 10px;
|
|
}
|
|
|
|
#ljpost-submit {
|
|
margin-top: 15px;
|
|
}
|
|
|
|
=======
|
|
float: left;
|
|
width: 200px;
|
|
margin-top: 10px;
|
|
}
|
|
|
|
#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
|
|
float: left;
|
|
margin-top: 10px;
|
|
}
|
|
|
|
#ljpost-submit {
|
|
margin-top: 15px;
|
|
}
|
|
>>>>>>> 99d9fddb6af9e872266666038447771e42ce13b4
|