# Pastebin C2llkzXT # interactive rebase in progress; onto 153afba # Last command done (1 command done): # pick f6f2ba8 Add test in travis to check if make clean actually removes all generated files #83 # Next commands to do (3 remaining commands): # pick dd7d606 Small fixes to #88. # pick 64a8e8a Also clean fx2lib. # (use "git rebase --edit-todo" to view and edit) # You are currently rebasing branch 'test-clean' on '153afba'. # (fix conflicts and then run "git rebase --continue") # (use "git rebase --skip" to skip this patch) # (use "git rebase --abort" to check out the original branch) # # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: .travis/run.sh # # Unmerged paths: # (use "git reset HEAD ..." to unstage) # (use "git add ..." to mark resolution) # # added by us: third_party/fx2lib #