summaryrefslogtreecommitdiffstats
path: root/test/integration/pullMergeConflict/recording.json
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration/pullMergeConflict/recording.json')
-rw-r--r--test/integration/pullMergeConflict/recording.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/integration/pullMergeConflict/recording.json b/test/integration/pullMergeConflict/recording.json
deleted file mode 100644
index 9631a1943..000000000
--- a/test/integration/pullMergeConflict/recording.json
+++ /dev/null
@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":1428,"Mod":0,"Key":256,"Ch":112},{"Timestamp":2571,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3459,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3852,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4419,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5267,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6266,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file