search

cegme / cs5293sp22

My class workspace.
MIT License
1 stars 48 forks source link

Updated unredactor.tsv #139

Closed bhavyareddykanuganti closed 2 years ago

cegme commented 2 years ago

There should only be one changed file

image
bhavyareddykanuganti commented 2 years ago

removed the extra files

cegme commented 2 years ago

Sorry there is a small conflict I cannot merge yet

bhavyareddykanuganti commented 2 years ago

Do I create a new pull request?

cegme commented 2 years ago

You don't have to. You can just request a review by clicking this after the changes.

image
cegme commented 2 years ago

You have to resolve the conflicts first

image
bhavyareddykanuganti commented 2 years ago

I'm not able to resolve it

Get Outlook for Androidhttps://aka.ms/AAb9ysg

From: Christan Grant @.> Sent: Sunday, May 8, 2022 8:43:42 PM To: cegme/cs5293sp22 @.> Cc: Kanuganti, Bhavya Reddy @.>; Author @.> Subject: Re: [cegme/cs5293sp22] Updated unredactor.tsv (PR #139)

You have to resolve the conflicts first [image]https://urldefense.com/v3/__https://user-images.githubusercontent.com/219429/167326793-2391ba31-a040-43b8-b93d-19183d82e47a.png__;!!GNU8KkXDZlD12Q!7yZHlfN8rVQPqLfkng5n2yGNAuGZMO0vhbK4JxhtBplwT9B_Po-R21UelqEOVCemLyKjLBFi3juHQuaSjckidicY5s_ibJooUI_HDg$

— Reply to this email directly, view it on GitHubhttps://urldefense.com/v3/__https://github.com/cegme/cs5293sp22/pull/139*issuecomment-1120546221__;Iw!!GNU8KkXDZlD12Q!7yZHlfN8rVQPqLfkng5n2yGNAuGZMO0vhbK4JxhtBplwT9B_Po-R21UelqEOVCemLyKjLBFi3juHQuaSjckidicY5s_ibJorN2zkgQ$, or unsubscribehttps://urldefense.com/v3/__https://github.com/notifications/unsubscribe-auth/AXRZX42HV74C5DQ6JM5SGGTVJBUU5ANCNFSM5VMUDFXA__;!!GNU8KkXDZlD12Q!7yZHlfN8rVQPqLfkng5n2yGNAuGZMO0vhbK4JxhtBplwT9B_Po-R21UelqEOVCemLyKjLBFi3juHQuaSjckidicY5s_ibJqeOJN8WQ$. You are receiving this because you authored the thread.Message ID: @.***>

cegme commented 2 years ago

You can close this PR and create a new one.