Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Davey2002_zbMATH01748069 ref + typo + List of mathematical symbols #416

Merged
merged 17 commits into from
Jan 30, 2018
Merged

Add Davey2002_zbMATH01748069 ref + typo + List of mathematical symbols #416

merged 17 commits into from
Jan 30, 2018

Conversation

jamesray1
Copy link
Contributor

No description provided.

@pirapira
Copy link
Member

Locally I get

! LaTeX Error: Environment tabularx undefined.

from pdflatex.

@jamesray1
Copy link
Contributor Author

That's because the tabularx package hasn't been added, so we'll need to merge that first.

@jamesray1
Copy link
Contributor Author

The PR with that in it, I mean.

@jamesray1
Copy link
Contributor Author

jamesray1 commented Jan 20, 2018 •
edited
Loading

Requires #436. Uses #444 (merged) and requires #451 (unmerged).

@jamesray1 jamesray1 changed the title Add Davey2002_zbMATH01748069 Add Davey2002_zbMATH01748069: Requires #436. Jan 20, 2018
@jamesray1 jamesray1 changed the title Add Davey2002_zbMATH01748069: Requires #436. Add Davey2002_zbMATH01748069. Jan 22, 2018
@jamesray1
Copy link
Contributor Author

jamesray1 commented Jan 22, 2018 •
edited
Loading

@pirapira, I tried to resolve this conflict but I think it requires you to resolve them after merging #451.

@jamesray1 jamesray1 changed the title Add Davey2002_zbMATH01748069. Add Davey2002_zbMATH01748069. Requires #451. Jan 23, 2018
@jamesray1 jamesray1 changed the title Add Davey2002_zbMATH01748069. Requires #451. Add Davey2002_zbMATH01748069. Jan 26, 2018
@jamesray1 jamesray1 changed the title Add Davey2002_zbMATH01748069. Add Davey2002_zbMATH01748069 ref + typo + List of mathematical symbols Jan 26, 2018
pirapira
pirapira suggested changes Jan 29, 2018
View reviewed changes
Paper.tex
@@ -106,6 +106,7 @@ \subsection{Previous Work} \label{ch:previous}
Early work on smart contracts has been done by \cite{szabo1997formalizing} and \cite{miller1997future}. Around the 1990s it became clear that algorithmic enforcement of agreements could become a significant force in human cooperation. Though no specific system was proposed to implement such a system, it was proposed that the future of law would be heavily affected by such systems. In this light, Ethereum may be seen as a general implementation of such a \textit{crypto-law} system.

%E language?
For a list of terms used in this paper, refer to Appendix \ref{ch:Terminology}.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ch:Terminology is not defined anywhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is now.

pirapira
pirapira approved these changes Jan 30, 2018
View reviewed changes
Copy link
Member

@pirapira pirapira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@pirapira pirapira merged commit 398d6aa into ethereum:master Jan 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pirapira pirapira pirapira approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jamesray1 @pirapira