Skip to content

Commit

Permalink
merge fix
Browse files Browse the repository at this point in the history
blinkybool committed Feb 1, 2020
1 parent 3bce700 commit ce36839
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions magma/catalan_families/friezePatterns.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
from magma import Catalan

class RS197(Catalan):
<<<<<<< HEAD
'''
Non-negative integer sequences (a_i) of length n+1 which generate a valid frieze pattern
1 1 1 1 1 1 1 1
a_1 a_2 a_3 . . . . a_n+1
b_1 b_2 b_3 . . . . b_n+1
. . . . . . . .
. . . . . . . .
z_1 z_2 z_3 . . . . z_n+1
1 1 1 1 1 1 1 1
of n rows, where any quadruple of the form below satisfies st-ru = 1
r
s t
u
Data Type: tuple(int).
Format: length n+1 sequences of non-negative integers.
'''
=======
"""
Non-negative integer sequences (a_i) of length m+1 which generate a valid
frieze pattern of m rows,
@@ -49,7 +31,6 @@ class RS197(Catalan):
1 2 2 2 1 4
1 1 1 1 1 1
"""
>>>>>>> e4f36df85f061f3cabbcb2af249ff76542394eda
ID = 'RS197'
names = ['Frieze Patterns']
keywords = {'frieze', 'pattern', 'sequence', 'ascii'}

0 comments on commit ce36839

Please sign in to comment.