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

diff --git a/ljpost/ljpost.css b/ljpost/ljpost.css
index 2087d3f0..e0494c5c 100755
--- 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