Remove merge conflict markers

Raku · Dec 16, 2017 · ce4aefa · ce4aefa
1 parent fbab8d3
commit ce4aefa
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/doc/Language/pod.pod6 b/doc/Language/pod.pod6
@@ -51,11 +51,7 @@ Perl6-ish option pairs. That is, any of:
  Boolean (true)    :key                  :key(1)
  Boolean (false)   :!key                 :key(0)
  String            :key<str>             :key('str')
-<<<<<<< HEAD
  List              :key<1 2 3>           :key[1, 2, 3]
-=======
- List              :key<1 2 3>           :key[1,2,3]
->>>>>>> origin/master
  Hash              :key{a=>1, b=>2}
 =end table