merge

semigroups · Aug 7, 2024 · 6508fc6 · 6508fc6
2 parents 3f93d05 + 29eab45
commit 6508fc6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/doc/attr.xml b/doc/attr.xml
@@ -1211,8 +1211,12 @@ gap> GeneratorsSmallest(T);
   <Returns> One inverse of an element of a semigroup.</Returns>
   <Description>
     <C>OneInverseOfSemigroupElement</C> returns one inverse of the element 
+<<<<<<< HEAD
     <C>x</C> in the semigroup <A>S</A> and returns fail if this
     element has no inverse in <A>S</A>.
+=======
+    <A>x</A> in the semigroup <A>S</A>.
+>>>>>>> 29eab454809100688443454edf381a4b201ede9c
   <Example><![CDATA[
   S := FullTransformationMonoid(4);
   <full transformation monoid of degree 4>