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

deleted fritzing folder with filter-branches #2991

Merged
merged 1 commit into from
Sep 10, 2014
Merged

deleted fritzing folder with filter-branches #2991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
solve mergeconflict in readme and gitignore
  • Loading branch information
@el-j
el-j committed Sep 10, 2014
commit aa7ca9e4776ce358768b748ab9c4187328290425
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ phoenix.pro.user
Makefile*

# no longer keep boost library in the source #
#####################
/src/lib/boost*


# Compiled source #
###################
*.pyc
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ the programmcode for the fritzing-application
tools for fritzing. including brd2svg, stable-release-maker and other tools

### translations ###
the languagefiles for fritzing.
the languagefiles for fritzing.