new plugin: profilehome

[friendica-addons.git] / ljpost / ljpost.css

diff --git a/ljpost/ljpost.css b/ljpost/ljpost.css
old mode 100644 (file)
new mode 100755 (executable)
index 8edab3d..2087d3f
--- 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