X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ljpost%2Fljpost.css;h=2087d3f057a0a241c482268f9aab0d25a0aab6a8;hb=d261a47f76a5176bf62aca797ebaefd4ad160256;hp=8edab3d99e56a93f18658f9ab64a57ffedc3679e;hpb=734d400b2f1a29ab595d1db0ee43be812a0fbdd7;p=friendica-addons.git

diff --git a/ljpost/ljpost.css b/ljpost/ljpost.css
old mode 100644
new mode 100755
index 8edab3d9..2087d3f0
--- a/ljpost/ljpost.css
+++ b/ljpost/ljpost.css
@@ -1,5 +1,21 @@
 
 #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;
@@ -12,4 +28,5 @@ margin-top: 10px;
 
 #ljpost-submit {
 margin-top: 15px;
-}
\ No newline at end of file
+}
+>>>>>>> 99d9fddb6af9e872266666038447771e42ce13b4