Fix conflicts

Author: adamwathan

__tests__/fixtures/tailwind-output.css

@@ -2219,6 +2219,10 @@ button,
   cursor: not-allowed;
 }
 
+.cursor-wait {
+  cursor: wait;
+}
+
 .block {
   display: block;
 }
@@ -6106,6 +6110,10 @@ button,
     cursor: not-allowed;
   }
 
+  .sm\:cursor-wait {
+    cursor: wait;
+  }
+
   .sm\:block {
     display: block;
   }
@@ -9986,6 +9994,10 @@ button,
     cursor: not-allowed;
   }
 
+  .md\:cursor-wait {
+    cursor: wait;
+  }
+
   .md\:block {
     display: block;
   }
@@ -13866,6 +13878,10 @@ button,
     cursor: not-allowed;
   }
 
+  .lg\:cursor-wait {
+    cursor: wait;
+  }
+
   .lg\:block {
     display: block;
   }
@@ -17746,6 +17762,10 @@ button,
     cursor: not-allowed;
   }
 
+  .xl\:cursor-wait {
+    cursor: wait;
+  }
+
   .xl\:block {
     display: block;
   }

src/generators/cursor.js

@@ -6,5 +6,6 @@ export default function() {
     'cursor-default': { cursor: 'default' },
     'cursor-pointer': { cursor: 'pointer' },
     'cursor-not-allowed': { cursor: 'not-allowed' },
+    'cursor-wait': { cursor: 'wait' },
   })
 }