Merge pull request #539 from MrPetovan/bug/4555-remove-active-users-feature

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

diff --git a/ljpost/ljpost.css b/ljpost/ljpost.css
old mode 100755 (executable)
new mode 100644 (file)
index 2087d3f..e0494c5
--- a/ljpost/ljpost.css
+++ b/ljpost/ljpost.css
@@ -1,6 +1,5 @@
 
 #ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label {
-<<<<<<< HEAD
        float: left;
        width: 200px;
        margin-top: 10px;
@@ -15,18 +14,3 @@
        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