sync

configuration/scripts/tests/base_suite.ts

@@ -1,14 +1,5 @@
 # Test         Grid    PEs        Sets    BFB-compare
 smoke          gx3     8x2        diag1,run5day
-<<<<<<< HEAD
-smoke          gx3     4x2        diag1,run5day          smoke_gx3_8x2_diag1_run5day
-smoke          gx3     4x1        diag1,run5day,thread   smoke_gx3_8x2_diag1_run5day
-smoke          gx3     1x1        debug,diag1,run2day
-smoke          gx3     1x4        debug,diag1,run2day
-smoke          gx3     4x1        debug,diag1,run5day
-smoke          gx3     8x2        diag24,run1year,medium
-decomp         gx3     4x2x25x29x5
-=======
 smoke          gx3     1x1        debug,diag1,run2day
 smoke          gx3     1x4        debug,diag1,run2day
 smoke          gx3     4x1        debug,diag1,run5day
@@ -17,29 +8,15 @@ smoke          gx3     8x2        diag24,run1year,medium
 decomp         gx3     4x2x25x29x5
 smoke          gx3     4x2        diag1,run5day          smoke_gx3_8x2_diag1_run5day
 smoke          gx3     4x1        diag1,run5day,thread   smoke_gx3_8x2_diag1_run5day
-<<<<<<< HEAD
-restart        gx1     40x4       droundrobin,short
-restart        tx1     40x4       dsectrobin,short
->>>>>>> upstream/master
-=======
 restart        gx1     40x4       droundrobin,medium
 restart        tx1     40x4       dsectrobin,medium
->>>>>>> 38cad4468c706be015d70720c2b4b5fecdd38720
 restart        gx3     4x4        none
 restart        gx3     4x4        iobinary
-restart        gx3     8x2        debug
-restart        gx1     40x4       droundrobin,short
 restart        gx3     6x2        alt01
 restart        gx3     8x2        alt02
 restart        gx3     4x2        alt03
 restart        gx3     4x4        alt04
 restart        gx3     4x4        alt05
-<<<<<<< HEAD
-restart        gbox128  4x2       boxdyn
-restart        gbox128  4x2       none
-restart        gbox128  4x4       boxrestore
-restart        gbox128  2x2       boxadv
-=======
 restart        gx3     6x2        alt01,debug,short
 restart        gx3     8x2        alt02,debug,short
 restart        gx3     4x2        alt03,debug,short
@@ -60,4 +37,3 @@ smoke          gx3     8x1        bgcskl,debug
 #smoke          gx3     4x1        bgcz,thread        smoke_gx3_8x2_bgcz
 restart        gx1     4x2        bgcsklclim,medium
 restart        gx1     8x1        bgczclim,medium
->>>>>>> 38cad4468c706be015d70720c2b4b5fecdd38720