Changes between Version 192 and Version 193 of DebianUbuntuPackaging
- Timestamp:
- May 22, 2018, 12:00:06 AM (6 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DebianUbuntuPackaging
v192 v193 136 136 git merge debian/`echo $VERSION | sed 's/~/_/g'`-${PATCH}`echo $EXP | sed 's/~/_/g'` 137 137 # solve changelog conflict issues 138 git checkout ORIG_HEAD -- debian/control.indebian/gbp.conf138 git checkout ORIG_HEAD -- debian/gbp.conf 139 139 }}} 140 140