escape git hell

Author: bramtayl

src/QueryOperators.jl

@@ -17,12 +17,6 @@ function translate_dispatch(::typeof(QueryOperators.filter), iterator, call, cal
 end
 
 @code_instead QueryOperators.groupby SourceCode Any Expr Any Expr
-<<<<<<< HEAD
-function translate_dispatch(::typeof(QueryOperators.groupby), ungrouped, group_function, group_function_expression, map_selector, map_function_expression; options...)
-    SQLExpression(Symbol("GROUP BY"),
-        translate(ungrouped; options...),
-        translate(group_function(model_row(ungrouped)).code; options...)
-=======
 
 struct GroupOfRows{Group, Row}
     group::Group
@@ -52,7 +46,6 @@ function translate_dispatch(::typeof(QueryOperators.groupby), ungrouped, group_f
     SQLExpression(Symbol("GROUP BY"),
         translate(ungrouped; options...),
         translate(group_function(model).code; options...)
->>>>>>> 60e2521
     )
 end
 

src/library.jl

@@ -98,12 +98,9 @@ export if_else
 @code_instead isless Any SourceCode
 @code_instead isless SourceCode SourceCode
 @translate_default ::typeof(isless) :<
-<<<<<<< HEAD
-=======
 
 @code_instead length SourceCode
 @translate_default ::typeof(length) :COUNT
->>>>>>> 60e2521
 
 @code_instead ismissing SourceCode
 @translate_default ::typeof(ismissing) Symbol("IS NULL")

test/runtests.jl

@@ -52,16 +52,10 @@ database2 = Database(SQLite.DB(filename))
     DataTable |>
     length == 347
 
-<<<<<<< HEAD
-# database.Track |>
-#     @groupby(_.AlbumId) |>
-#     @map({AlbumId = key(_), Count = length(_)})
-=======
 @test (database.Track |>
     @groupby(_.AlbumId) |>
     @map({AlbumId = key(_), Count = length(_.AlbumId)}) |>
     collect |>
     first).Count == 10
->>>>>>> 60e2521
 
 end